Ticket #28290: 28290.patch

wp-admin/admin-footer.php

@@ -86 +86 @@
  */
 do_action( "admin_footer-" . $GLOBALS['hook_suffix'] );
 
-// get_site_option() won't exist when auto upgrading from <= 2.7
-if ( function_exists('get_site_option') ) {
-        if ( false === get_site_option('can_compress_scripts') )
+// get_network_option() won't exist when auto upgrading from <= 2.7
+if ( function_exists( 'get_network_option' ) ) {
+        if ( false === get_network_option('can_compress_scripts') )
                 compression_test();
 }
 

wp-admin/includes/ajax-actions.php

@@ -165 +165 @@
                 wp_die( -1 );
 
         if ( ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler') ) {
-                update_site_option('can_compress_scripts', 0);
+                update_network_option('can_compress_scripts', 0);
                 wp_die( 0 );
         }
 
@@ -196 +196 @@
                         echo $out;
                         wp_die();
                 } elseif ( 'no' == $_GET['test'] ) {
-                        update_site_option('can_compress_scripts', 0);
+                        update_network_option('can_compress_scripts', 0);
                 } elseif ( 'yes' == $_GET['test'] ) {
-                        update_site_option('can_compress_scripts', 1);
+                        update_network_option('can_compress_scripts', 1);
                 }
         }
 

wp-admin/includes/class-wp-themes-list-table.php

@@ -102 +102 @@
                         }
                 }
                 // Fallthrough.
-                printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) );
+                printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_network_option( 'site_name' ) );
         }
 
         /**

wp-admin/includes/class-wp-upgrader.php

@@ -2345 +2345 @@
                 if ( version_compare( $wp_version, $offered_ver, '>' ) )
                         return false;
 
-                $failure_data = get_site_option( 'auto_core_update_failed' );
+                $failure_data = get_network_option( 'auto_core_update_failed' );
                 if ( $failure_data ) {
                         // If this was a critical update failure, cannot update.
                         if ( ! empty( $failure_data['critical'] ) )
@@ -2758 +2758 @@
          * @param object $item The update offer.
          */
         protected function send_core_update_notification_email( $item ) {
-                $notified = get_site_option( 'auto_core_update_notified' );
+                $notified = get_network_option( 'auto_core_update_notified' );
 
                 // Don't notify if we've already notified the same email address of the same version.
-                if ( $notified && $notified['email'] == get_site_option( 'admin_email' ) && $notified['version'] == $item->current )
+                if ( $notified && $notified['email'] == get_network_option( 'admin_email' ) && $notified['version'] == $item->current )
                         return false;
 
                 // See if we need to notify users of a core update.
@@ -3086 +3086 @@
                                 $critical_data['rollback_code'] = $rollback_result->get_error_code();
                                 $critical_data['rollback_data'] = $rollback_result->get_error_data();
                         }
-                        update_site_option( 'auto_core_update_failed', $critical_data );
+                        update_network_option( 'auto_core_update_failed', $critical_data );
                         $this->send_email( 'critical', $core_update, $result );
                         return;
                 }
@@ -3104 +3104 @@
                  */
                 $send = true;
                 $transient_failures = array( 'incompatible_archive', 'download_failed', 'insane_distro' );
-                if ( in_array( $error_code, $transient_failures ) && ! get_site_option( 'auto_core_update_failed' ) ) {
+                if ( in_array( $error_code, $transient_failures ) && ! get_network_option( 'auto_core_update_failed' ) ) {
                         wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'wp_maybe_auto_update' );
                         $send = false;
                 }
 
-                $n = get_site_option( 'auto_core_update_notified' );
+                $n = get_network_option( 'auto_core_update_notified' );
                 // Don't notify if we've already notified the same email address of the same version of the same notification type.
-                if ( $n && 'fail' == $n['type'] && $n['email'] == get_site_option( 'admin_email' ) && $n['version'] == $core_update->current )
+                if ( $n && 'fail' == $n['type'] && $n['email'] == get_network_option( 'admin_email' ) && $n['version'] == $core_update->current )
                         $send = false;
 
-                update_site_option( 'auto_core_update_failed', array(
+                update_network_option( 'auto_core_update_failed', array(
                         'attempted'  => $core_update->current,
                         'current'    => $wp_version,
                         'error_code' => $error_code,
@@ -3140 +3140 @@
          * @param mixed  $result      Optional. The result for the core update. Can be WP_Error.
          */
         protected function send_email( $type, $core_update, $result = null ) {
-                update_site_option( 'auto_core_update_notified', array(
+                update_network_option( 'auto_core_update_notified', array(
                         'type'      => $type,
-                        'email'     => get_site_option( 'admin_email' ),
+                        'email'     => get_network_option( 'admin_email' ),
                         'version'   => $core_update->current,
                         'timestamp' => time(),
                 ) );
@@ -3298 +3298 @@
                         $body .= "\n";
                 }
 
-                $to  = get_site_option( 'admin_email' );
+                $to  = get_network_option( 'admin_email' );
                 $headers = '';
 
                 $email = compact( 'to', 'subject', 'body', 'headers' );
@@ -3450 +3450 @@
                 }
 
                 $email = array(
-                        'to'      => get_site_option( 'admin_email' ),
+                        'to'      => get_network_option( 'admin_email' ),
                         'subject' => $subject,
                         'body'    => implode( "\n", $body ),
                         'headers' => ''

wp-admin/includes/dashboard.php

@@ -1193 +1193 @@
  * @return bool|null True if not multisite, user can't upload files, or the space check option is disabled.
 */
 function wp_dashboard_quota() {
-        if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) )
+        if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_network_option( 'upload_space_check_disabled' ) )
                 return true;
 
         $quota = get_space_allowed();

wp-admin/includes/ms.php

@@ -16 +16 @@
  * @return array $_FILES array with 'error' key set if file exceeds quota. 'error' is empty otherwise.
  */
 function check_upload_size( $file ) {
-        if ( get_site_option( 'upload_space_check_disabled' ) )
+        if ( get_network_option( 'upload_space_check_disabled' ) )
                 return $file;
 
         if ( $file['error'] != '0' ) // there's already an error
@@ -30 +30 @@
         $file_size = filesize( $file['tmp_name'] );
         if ( $space_left < $file_size )
                 $file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ($file_size - $space_left) /1024 ) );
-        if ( $file_size > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
-                $file['error'] = sprintf(__('This file is too big. Files must be less than %1$s KB in size.'), get_site_option( 'fileupload_maxk', 1500 ) );
+        if ( $file_size > ( 1024 * get_network_option( 'fileupload_maxk', 1500 ) ) )
+                $file['error'] = sprintf(__('This file is too big. Files must be less than %1$s KB in size.'), get_network_option( 'fileupload_maxk', 1500 ) );
         if ( upload_is_user_over_quota( false ) ) {
                 $file['error'] = __( 'You have used your space quota. Please delete files before uploading.' );
         }
@@ -98 +98 @@
         $upload_path = trim( get_option( 'upload_path' ) );
 
         // If ms_files_rewriting is enabled and upload_path is empty, wp_upload_dir is not reliable.
-        if ( $drop && get_site_option( 'ms_files_rewriting' ) && empty( $upload_path ) ) {
+        if ( $drop && get_network_option( 'ms_files_rewriting' ) && empty( $upload_path ) ) {
                 $drop = false;
         }
 
@@ -306 +306 @@
         $content = str_replace( '###USERNAME###', $current_user->user_login, $content );
         $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'options.php?adminhash='.$hash ) ), $content );
         $content = str_replace( '###EMAIL###', $value, $content );
-        $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
+        $content = str_replace( '###SITENAME###', get_network_option( 'site_name' ), $content );
         $content = str_replace( '###SITEURL###', network_home_url(), $content );
 
         wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
@@ -385 +385 @@
                 $content = str_replace( '###USERNAME###', $current_user->user_login, $content );
                 $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'profile.php?newuseremail='.$hash ) ), $content );
                 $content = str_replace( '###EMAIL###', $_POST['email'], $content);
-                $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
+                $content = str_replace( '###SITENAME###', get_network_option( 'site_name' ), $content );
                 $content = str_replace( '###SITEURL###', network_home_url(), $content );
 
                 wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
@@ -413 +413 @@
  * @return bool True if user is over upload space quota, otherwise false.
  */
 function upload_is_user_over_quota( $echo = true ) {
-        if ( get_site_option( 'upload_space_check_disabled' ) )
+        if ( get_network_option( 'upload_space_check_disabled' ) )
                 return false;
 
         $space_allowed = get_space_allowed();
@@ -746 +746 @@
         global $wp_db_version;
         if ( !is_super_admin() )
                 return false;
-        if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
+        if ( get_network_option( 'wpmu_upgrade_site' ) != $wp_db_version )
                 echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "</div>";
 }
 
@@ -828 +828 @@
                 ?>
                 </td>
         </tr>
-        <?php if ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ) ) ) : ?>
+        <?php if ( in_array( get_network_option( 'registration' ), array( 'all', 'blog' ) ) ) : ?>
                 <tr>
                         <th scope="row" colspan="2" class="th-full">
                                 <?php
@@ -870 +870 @@
         do_action( 'grant_super_admin', $user_id );
 
         // Directly fetch site_admins instead of using get_super_admins()
-        $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+        $super_admins = get_network_option( 'site_admins', array( 'admin' ) );
 
         $user = get_userdata( $user_id );
         if ( $user && ! in_array( $user->user_login, $super_admins ) ) {
                 $super_admins[] = $user->user_login;
-                update_site_option( 'site_admins' , $super_admins );
+                update_network_option( 'site_admins' , $super_admins );
 
                 /**
                  * Fires after the user is granted Super Admin privileges.
@@ -917 +917 @@
         do_action( 'revoke_super_admin', $user_id );
 
         // Directly fetch site_admins instead of using get_super_admins()
-        $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+        $super_admins = get_network_option( 'site_admins', array( 'admin' ) );
 
         $user = get_userdata( $user_id );
-        if ( $user && 0 !== strcasecmp( $user->user_email, get_site_option( 'admin_email' ) ) ) {
+        if ( $user && 0 !== strcasecmp( $user->user_email, get_network_option( 'admin_email' ) ) ) {
                 if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
                         unset( $super_admins[$key] );
-                        update_site_option( 'site_admins', $super_admins );
+                        update_network_option( 'site_admins', $super_admins );
 
                         /**
                          * Fires after the user's Super Admin privileges are revoked.

wp-admin/includes/network.php

@@ -404 +404 @@
                     <match url="^index\.php$" ignoreCase="false" />
                     <action type="None" />
                 </rule>';
-                                if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
+                                if ( is_multisite() && get_network_option( 'ms_files_rewriting' ) ) {
                                         $web_config_file .= '
                 <rule name="WordPress Rule for Files" stopProcessing="true">
                     <match url="^' . $iis_subdir_match . 'files/(.+)" ignoreCase="false" />
@@ -457 +457 @@
         <?php else : // end iis7_supports_permalinks(). construct an htaccess file instead:
 
                 $ms_files_rewriting = '';
-                if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
+                if ( is_multisite() && get_network_option( 'ms_files_rewriting' ) ) {
                         $ms_files_rewriting = "\n# uploaded files\nRewriteRule ^";
                         $ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}" . WPINC . "/ms-files.php?file={$subdir_replacement_12} [L]" . "\n";
                 }

wp-admin/includes/plugin.php

@@ -465 +465 @@
         if ( !is_multisite() )
                 return false;
 
-        $plugins = get_site_option( 'active_sitewide_plugins');
+        $plugins = get_network_option( 'active_sitewide_plugins');
         if ( isset($plugins[$plugin]) )
                 return true;
 
@@ -523 +523 @@
 
         if ( is_multisite() && ( $network_wide || is_network_only_plugin($plugin) ) ) {
                 $network_wide = true;
-                $current = get_site_option( 'active_sitewide_plugins', array() );
+                $current = get_network_option( 'active_sitewide_plugins', array() );
                 $_GET['networkwide'] = 1; // Back compat for plugins looking for this value.
         } else {
                 $current = get_option( 'active_plugins', array() );
@@ -576 +576 @@
                 }
 
                 if ( $network_wide ) {
-                        $current = get_site_option( 'active_sitewide_plugins', array() );
+                        $current = get_network_option( 'active_sitewide_plugins', array() );
                         $current[$plugin] = time();
-                        update_site_option( 'active_sitewide_plugins', $current );
+                        update_network_option( 'active_sitewide_plugins', $current );
                 } else {
                         $current = get_option( 'active_plugins', array() );
                         $current[] = $plugin;
@@ -627 +627 @@
  */
 function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
         if ( is_multisite() )
-                $network_current = get_site_option( 'active_sitewide_plugins', array() );
+                $network_current = get_network_option( 'active_sitewide_plugins', array() );
         $current = get_option( 'active_plugins', array() );
         $do_blog = $do_network = false;
 
@@ -708 +708 @@
         if ( $do_blog )
                 update_option('active_plugins', $current);
         if ( $do_network )
-                update_site_option( 'active_sitewide_plugins', $network_current );
+                update_network_option( 'active_sitewide_plugins', $network_current );
 }
 
 /**
@@ -880 +880 @@
         }
 
         if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
-                $network_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
+                $network_plugins = (array) get_network_option( 'active_sitewide_plugins', array() );
                 $plugins = array_merge( $plugins, array_keys( $network_plugins ) );
         }
 

wp-admin/includes/schema.php

@@ -928 +928 @@
                         }
                 }
         } else {
-                $site_admins = get_site_option( 'site_admins' );
+                $site_admins = get_network_option( 'site_admins' );
         }
 
         /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
@@ -978 +978 @@
                 // @todo - network admins should have a method of editing the network siteurl (used for cookie hash)
                 'siteurl' => get_option( 'siteurl' ) . '/',
                 'add_new_users' => '0',
-                'upload_space_check_disabled' => is_multisite() ? get_site_option( 'upload_space_check_disabled' ) : '1',
+                'upload_space_check_disabled' => is_multisite() ? get_network_option( 'upload_space_check_disabled' ) : '1',
                 'subdomain_install' => intval( $subdomain_install ),
                 'global_terms_enabled' => global_terms_enabled() ? '1' : '0',
-                'ms_files_rewriting' => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
+                'ms_files_rewriting' => is_multisite() ? get_network_option( 'ms_files_rewriting' ) : '0',
                 'initial_db_version' => get_option( 'initial_db_version' ),
                 'active_sitewide_plugins' => array(),
                 'WPLANG' => get_locale(),

wp-admin/includes/update-core.php

@@ -1102 +1102 @@
         do_action( '_core_updated_successfully', $wp_version );
 
         // Clear the option that blocks auto updates after failures, now that we've been successful.
-        if ( function_exists( 'delete_site_option' ) )
-                delete_site_option( 'auto_core_update_failed' );
+        if ( function_exists( 'delete_network_option' ) )
+                delete_network_option( 'auto_core_update_failed' );
 
         return $wp_version;
 }

wp-admin/includes/update.php

@@ -29 +29 @@
  */
 function get_core_updates( $options = array() ) {
         $options = array_merge( array( 'available' => true, 'dismissed' => false ), $options );
-        $dismissed = get_site_option( 'dismissed_update_core' );
+        $dismissed = get_network_option( 'dismissed_update_core' );
 
         if ( ! is_array( $dismissed ) )
                 $dismissed = array();
@@ -134 +134 @@
  * @return bool
  */
 function dismiss_core_update( $update ) {
-        $dismissed = get_site_option( 'dismissed_update_core' );
+        $dismissed = get_network_option( 'dismissed_update_core' );
         $dismissed[ $update->current . '|' . $update->locale ] = true;
-        return update_site_option( 'dismissed_update_core', $dismissed );
+        return update_network_option( 'dismissed_update_core', $dismissed );
 }
 
 /**
@@ -146 +146 @@
  * @return bool
  */
 function undismiss_core_update( $version, $locale ) {
-        $dismissed = get_site_option( 'dismissed_update_core' );
+        $dismissed = get_network_option( 'dismissed_update_core' );
         $key = $version . '|' . $locale;
 
         if ( ! isset( $dismissed[$key] ) )
                 return false;
 
         unset( $dismissed[$key] );
-        return update_site_option( 'dismissed_update_core', $dismissed );
+        return update_network_option( 'dismissed_update_core', $dismissed );
 }
 
 /**
@@ -478 +478 @@
         global $upgrading;
         $nag = isset( $upgrading );
         if ( ! $nag ) {
-                $failed = get_site_option( 'auto_core_update_failed' );
+                $failed = get_network_option( 'auto_core_update_failed' );
                 /*
                  * If an update failed critically, we may have copied over version.php but not other files.
                  * In that case, if the install claims we're running the version we attempted, nag.

wp-admin/includes/upgrade.php

@@ -153 +153 @@
         $first_post_guid = get_option( 'home' ) . '/?p=1';
 
         if ( is_multisite() ) {
-                $first_post = get_site_option( 'first_post' );
+                $first_post = get_network_option( 'first_post' );
 
                 if ( empty($first_post) )
                         $first_post = __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start writing!' );
@@ -189 +189 @@
         $first_comment = __('Hi, this is a comment.
 To delete a comment, just log in and view the post&#039;s comments. There you will have the option to edit or delete them.');
         if ( is_multisite() ) {
-                $first_comment_author = get_site_option( 'first_comment_author', $first_comment_author );
-                $first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
-                $first_comment = get_site_option( 'first_comment', $first_comment );
+                $first_comment_author = get_network_option( 'first_comment_author', $first_comment_author );
+                $first_comment_url = get_network_option( 'first_comment_url', network_home_url() );
+                $first_comment = get_network_option( 'first_comment', $first_comment );
         }
         $wpdb->insert( $wpdb->comments, array(
                 'comment_post_ID' => 1,
@@ -214 +214 @@
 
 As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url() );
         if ( is_multisite() )
-                $first_page = get_site_option( 'first_page', $first_page );
+                $first_page = get_network_option( 'first_page', $first_page );
         $first_post_guid = get_option('home') . '/?page_id=2';
         $wpdb->insert( $wpdb->posts, array(
                 'post_author' => $user_id,
@@ -1255 +1255 @@
         if ( $wp_current_db_version < 15093 )
                 populate_roles_300();
 
-        if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
-                add_site_option( 'siteurl', '' );
+        if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_network_option( 'siteurl' ) === false )
+                add_network_option( 'siteurl', '' );
 
         // 3.0 screen options key name changes.
         if ( wp_should_upgrade_global_tables() ) {
@@ -1643 +1643 @@
 
         // 2.8.
         if ( $wp_current_db_version < 11549 ) {
-                $wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
-                $active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
+                $wpmu_sitewide_plugins = get_network_option( 'wpmu_sitewide_plugins' );
+                $active_sitewide_plugins = get_network_option( 'active_sitewide_plugins' );
                 if ( $wpmu_sitewide_plugins ) {
                         if ( !$active_sitewide_plugins )
                                 $sitewide_plugins = (array) $wpmu_sitewide_plugins;
                         else
                                 $sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
 
-                        update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
+                        update_network_option( 'active_sitewide_plugins', $sitewide_plugins );
                 }
-                delete_site_option( 'wpmu_sitewide_plugins' );
-                delete_site_option( 'deactivated_sitewide_plugins' );
+                delete_network_option( 'wpmu_sitewide_plugins' );
+                delete_network_option( 'deactivated_sitewide_plugins' );
 
                 $start = 0;
                 while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
@@ -1663 +1663 @@
                                 if ( !@unserialize( $value ) )
                                         $value = stripslashes( $value );
                                 if ( $value !== $row->meta_value ) {
-                                        update_site_option( $row->meta_key, $value );
+                                        update_network_option( $row->meta_key, $value );
                                 }
                         }
                         $start += 20;
@@ -1672 +1672 @@
 
         // 3.0
         if ( $wp_current_db_version < 13576 )
-                update_site_option( 'global_terms_enabled', '1' );
+                update_network_option( 'global_terms_enabled', '1' );
 
         // 3.3
         if ( $wp_current_db_version < 19390 )
-                update_site_option( 'initial_db_version', $wp_current_db_version );
+                update_network_option( 'initial_db_version', $wp_current_db_version );
 
         if ( $wp_current_db_version < 19470 ) {
-                if ( false === get_site_option( 'active_sitewide_plugins' ) )
-                        update_site_option( 'active_sitewide_plugins', array() );
+                if ( false === get_network_option( 'active_sitewide_plugins' ) )
+                        update_network_option( 'active_sitewide_plugins', array() );
         }
 
         // 3.4
         if ( $wp_current_db_version < 20148 ) {
                 // 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
-                $allowedthemes  = get_site_option( 'allowedthemes'  );
-                $allowed_themes = get_site_option( 'allowed_themes' );
+                $allowedthemes  = get_network_option( 'allowedthemes'  );
+                $allowed_themes = get_network_option( 'allowed_themes' );
                 if ( false === $allowedthemes && is_array( $allowed_themes ) && $allowed_themes ) {
                         $converted = array();
                         $themes = wp_get_themes();
@@ -1695 +1695 @@
                                 if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) )
                                         $converted[ $stylesheet ] = true;
                         }
-                        update_site_option( 'allowedthemes', $converted );
-                        delete_site_option( 'allowed_themes' );
+                        update_network_option( 'allowedthemes', $converted );
+                        delete_network_option( 'allowed_themes' );
                 }
         }
 
         // 3.5
         if ( $wp_current_db_version < 21823 )
-                update_site_option( 'ms_files_rewriting', '1' );
+                update_network_option( 'ms_files_rewriting', '1' );
 
         // 3.5.2
         if ( $wp_current_db_version < 24448 ) {
-                $illegal_names = get_site_option( 'illegal_names' );
+                $illegal_names = get_network_option( 'illegal_names' );
                 if ( is_array( $illegal_names ) && count( $illegal_names ) === 1 ) {
                         $illegal_name = reset( $illegal_names );
                         $illegal_names = explode( ' ', $illegal_name );
-                        update_site_option( 'illegal_names', $illegal_names );
+                        update_network_option( 'illegal_names', $illegal_names );
                 }
         }
 

wp-admin/network/settings.php

@@ -76 +76 @@
                 if ( ! isset($_POST[$option_name]) )
                         continue;
                 $value = wp_unslash( $_POST[$option_name] );
-                update_site_option( $option_name, $value );
+                update_network_option( $option_name, $value );
         }
 
         /**
@@ -113 +113 @@
                         <tr>
                                 <th scope="row"><label for="admin_email"><?php _e( 'Network Admin Email' ) ?></label></th>
                                 <td>
-                                        <input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-desc" class="regular-text" value="<?php echo esc_attr( get_site_option( 'admin_email' ) ) ?>" />
+                                        <input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-desc" class="regular-text" value="<?php echo esc_attr( get_network_option( 'admin_email' ) ) ?>" />
                                         <p class="description" id="admin-email-desc">
                                                 <?php _e( 'This email address will receive notifications. Registration and support emails will also come from this address.' ); ?>
                                         </p>
@@ -125 +125 @@
                         <tr>
                                 <th scope="row"><?php _e( 'Allow new registrations' ) ?></th>
                                 <?php
-                                if ( !get_site_option( 'registration' ) )
-                                        update_site_option( 'registration', 'none' );
-                                $reg = get_site_option( 'registration' );
+                                if ( !get_network_option( 'registration' ) )
+                                        update_network_option( 'registration', 'none' );
+                                $reg = get_network_option( 'registration' );
                                 ?>
                                 <td>
                                         <fieldset>
@@ -146 +146 @@
                         <tr>
                                 <th scope="row"><?php _e( 'Registration notification' ) ?></th>
                                 <?php
-                                if ( !get_site_option( 'registrationnotification' ) )
-                                        update_site_option( 'registrationnotification', 'yes' );
+                                if ( !get_network_option( 'registrationnotification' ) )
+                                        update_network_option( 'registrationnotification', 'yes' );
                                 ?>
                                 <td>
-                                        <label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_site_option( 'registrationnotification' ), 'yes' ) ?> /> <?php _e( 'Send the network admin an email notification every time someone registers a site or user account.' ) ?></label>
+                                        <label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_network_option( 'registrationnotification' ), 'yes' ) ?> /> <?php _e( 'Send the network admin an email notification every time someone registers a site or user account.' ) ?></label>
                                 </td>
                         </tr>
 
                         <tr id="addnewusers">
                                 <th scope="row"><?php _e( 'Add New Users' ) ?></th>
                                 <td>
-                                        <label><input name="add_new_users" type="checkbox" id="add_new_users" value="1"<?php checked( get_site_option( 'add_new_users' ) ) ?> /> <?php _e( 'Allow site administrators to add new users to their site via the "Users &rarr; Add New" page.' ); ?></label>
+                                        <label><input name="add_new_users" type="checkbox" id="add_new_users" value="1"<?php checked( get_network_option( 'add_new_users' ) ) ?> /> <?php _e( 'Allow site administrators to add new users to their site via the "Users &rarr; Add New" page.' ); ?></label>
                                 </td>
                         </tr>
 
                         <tr>
                                 <th scope="row"><label for="illegal_names"><?php _e( 'Banned Names' ) ?></label></th>
                                 <td>
-                                        <input name="illegal_names" type="text" id="illegal_names" aria-describedby="illegal-names-desc" class="large-text" value="<?php echo esc_attr( implode( " ", (array) get_site_option( 'illegal_names' ) ) ); ?>" size="45" />
+                                        <input name="illegal_names" type="text" id="illegal_names" aria-describedby="illegal-names-desc" class="large-text" value="<?php echo esc_attr( implode( " ", (array) get_network_option( 'illegal_names' ) ) ); ?>" size="45" />
                                         <p class="description" id="illegal-names-desc">
                                                 <?php _e( 'Users are not allowed to register these sites. Separate names by spaces.' ) ?>
                                         </p>
@@ -174 +174 @@
                         <tr>
                                 <th scope="row"><label for="limited_email_domains"><?php _e( 'Limited Email Registrations' ) ?></label></th>
                                 <td>
-                                        <?php $limited_email_domains = get_site_option( 'limited_email_domains' );
+                                        <?php $limited_email_domains = get_network_option( 'limited_email_domains' );
                                         $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
                                         <textarea name="limited_email_domains" id="limited_email_domains" aria-describedby="limited-email-domains-desc" cols="45" rows="5">
 <?php echo esc_textarea( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
@@ -188 +188 @@
                                 <th scope="row"><label for="banned_email_domains"><?php _e('Banned Email Domains') ?></label></th>
                                 <td>
                                         <textarea name="banned_email_domains" id="banned_email_domains" aria-describedby="banned-email-domains-desc" cols="45" rows="5">
-<?php echo esc_textarea( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea>
+<?php echo esc_textarea( get_network_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_network_option( 'banned_email_domains' ) ) ); ?></textarea>
                                         <p class="description" id="banned-email-domains-desc">
                                                 <?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?>
                                         </p>
@@ -203 +203 @@
                                 <th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></th>
                                 <td>
                                         <textarea name="welcome_email" id="welcome_email" aria-describedby="welcome-email-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'welcome_email' ) ) ?></textarea>
+<?php echo esc_textarea( get_network_option( 'welcome_email' ) ) ?></textarea>
                                         <p class="description" id="welcome-email-desc">
                                                 <?php _e( 'The welcome email sent to new site owners.' ) ?>
                                         </p>
@@ -213 +213 @@
                                 <th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></th>
                                 <td>
                                         <textarea name="welcome_user_email" id="welcome_user_email" aria-describedby="welcome-user-email-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'welcome_user_email' ) ) ?></textarea>
+<?php echo esc_textarea( get_network_option( 'welcome_user_email' ) ) ?></textarea>
                                         <p class="description" id="welcome-user-email-desc">
                                                 <?php _e( 'The welcome email sent to new users.' ) ?>
                                         </p>
@@ -223 +223 @@
                                 <th scope="row"><label for="first_post"><?php _e( 'First Post' ) ?></label></th>
                                 <td>
                                         <textarea name="first_post" id="first_post" aria-describedby="first-post-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'first_post' ) ) ?></textarea>
+<?php echo esc_textarea( get_network_option( 'first_post' ) ) ?></textarea>
                                         <p class="description" id="first-post-desc">
                                                 <?php _e( 'The first post on a new site.' ) ?>
                                         </p>
@@ -233 +233 @@
                                 <th scope="row"><label for="first_page"><?php _e( 'First Page' ) ?></label></th>
                                 <td>
                                         <textarea name="first_page" id="first_page" aria-describedby="first-page-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'first_page' ) ) ?></textarea>
+<?php echo esc_textarea( get_network_option( 'first_page' ) ) ?></textarea>
                                         <p class="description" id="first-page-desc">
                                                 <?php _e( 'The first page on a new site.' ) ?>
                                         </p>
@@ -243 +243 @@
                                 <th scope="row"><label for="first_comment"><?php _e( 'First Comment' ) ?></label></th>
                                 <td>
                                         <textarea name="first_comment" id="first_comment" aria-describedby="first-comment-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'first_comment' ) ) ?></textarea>
+<?php echo esc_textarea( get_network_option( 'first_comment' ) ) ?></textarea>
                                         <p class="description" id="first-comment-desc">
                                                 <?php _e( 'The first comment on a new site.' ) ?>
                                         </p>
@@ -252 +252 @@
                         <tr>
                                 <th scope="row"><label for="first_comment_author"><?php _e( 'First Comment Author' ) ?></label></th>
                                 <td>
-                                        <input type="text" size="40" name="first_comment_author" id="first_comment_author" aria-describedby="first-comment-author-desc" value="<?php echo get_site_option('first_comment_author') ?>" />
+                                        <input type="text" size="40" name="first_comment_author" id="first_comment_author" aria-describedby="first-comment-author-desc" value="<?php echo get_network_option('first_comment_author') ?>" />
                                         <p class="description" id="first-comment-author-desc">
                                                 <?php _e( 'The author of the first comment on a new site.' ) ?>
                                         </p>
@@ -261 +261 @@
                         <tr>
                                 <th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></th>
                                 <td>
-                                        <input type="text" size="40" name="first_comment_url" id="first_comment_url" aria-describedby="first-comment-url-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_url' ) ) ?>" />
+                                        <input type="text" size="40" name="first_comment_url" id="first_comment_url" aria-describedby="first-comment-url-desc" value="<?php echo esc_attr( get_network_option( 'first_comment_url' ) ) ?>" />
                                         <p class="description" id="first-comment-url-desc">
                                                 <?php _e( 'The URL for the first comment on a new site.' ) ?>
                                         </p>
@@ -273 +273 @@
                         <tr>
                                 <th scope="row"><?php _e( 'Site upload space' ) ?></th>
                                 <td>
-                                        <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="' . esc_attr( get_site_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />
+                                        <label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( get_network_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="' . esc_attr( get_network_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />
                                         <p class="screen-reader-text" id="blog-upload-space-desc">
                                                 <?php _e( 'Size in megabytes' ) ?>
                                         </p>
@@ -283 +283 @@
                         <tr>
                                 <th scope="row"><label for="upload_filetypes"><?php _e( 'Upload file types' ) ?></label></th>
                                 <td>
-                                        <input name="upload_filetypes" type="text" id="upload_filetypes" aria-describedby="upload-filetypes-desc" class="large-text" value="<?php echo esc_attr( get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) ) ?>" size="45" />
+                                        <input name="upload_filetypes" type="text" id="upload_filetypes" aria-describedby="upload-filetypes-desc" class="large-text" value="<?php echo esc_attr( get_network_option( 'upload_filetypes', 'jpg jpeg png gif' ) ) ?>" size="45" />
                                         <p class="description" id="upload-filetypes-desc">
                                                 <?php _e( 'Allowed file types. Separate types by spaces.' ) ?>
                                         </p>
@@ -293 +293 @@
                         <tr>
                                 <th scope="row"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ) ?></label></th>
                                 <td>
-                                        <?php printf( _x( '%s KB', 'File size in kilobytes' ), '<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" aria-describedby="fileupload-maxk-desc" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" />' ); ?>
+                                        <?php printf( _x( '%s KB', 'File size in kilobytes' ), '<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" aria-describedby="fileupload-maxk-desc" value="' . esc_attr( get_network_option( 'fileupload_maxk', 300 ) ) . '" />' ); ?>
                                         <p class="screen-reader-text" id="fileupload-maxk-desc">
                                                 <?php _e( 'Size in kilobytes' ) ?>
                                         </p>
@@ -312 +312 @@
                                         <th><label for="WPLANG"><?php _e( 'Default Language' ); ?></label></th>
                                         <td>
                                                 <?php
-                                                $lang = get_site_option( 'WPLANG' );
+                                                $lang = get_network_option( 'WPLANG' );
                                                 if ( ! in_array( $lang, $languages ) ) {
                                                         $lang = '';
                                                 }
@@ -339 +339 @@
                                 <th scope="row"><?php _e( 'Enable administration menus' ); ?></th>
                                 <td>
                         <?php
-                        $menu_perms = get_site_option( 'menu_items' );
+                        $menu_perms = get_network_option( 'menu_items' );
                         /**
                          * Filter available network-wide administration menu options.
                          *

wp-admin/network/site-new.php

@@ -123 +123 @@
                         get_site_url( $id ),
                         wp_unslash( $title )
                 );
-                wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
+                wp_mail( get_network_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_network_option( 'admin_email' ) . '>' );
                 wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
                 wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) );
                 exit;
@@ -188 +188 @@
                                 <td>
                                         <?php
                                         // Network default.
-                                        $lang = get_site_option( 'WPLANG' );
+                                        $lang = get_network_option( 'WPLANG' );
 
                                         // Use English if the default isn't available.
                                         if ( ! in_array( $lang, $languages ) ) {

wp-admin/network/themes.php

@@ -29 +29 @@
 $referer = remove_query_arg( $temp_args, wp_get_referer() );
 
 if ( $action ) {
-        $allowed_themes = get_site_option( 'allowedthemes' );
+        $allowed_themes = get_network_option( 'allowedthemes' );
         switch ( $action ) {
                 case 'enable':
                         check_admin_referer('enable-theme_' . $_GET['theme']);
                         $allowed_themes[ $_GET['theme'] ] = true;
-                        update_site_option( 'allowedthemes', $allowed_themes );
+                        update_network_option( 'allowedthemes', $allowed_themes );
                         if ( false === strpos( $referer, '/network/themes.php' ) )
                                 wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
                         else
@@ -43 +43 @@
                 case 'disable':
                         check_admin_referer('disable-theme_' . $_GET['theme']);
                         unset( $allowed_themes[ $_GET['theme'] ] );
-                        update_site_option( 'allowedthemes', $allowed_themes );
+                        update_network_option( 'allowedthemes', $allowed_themes );
                         wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
                         exit;
                 case 'enable-selected':
@@ -55 +55 @@
                         }
                         foreach ( (array) $themes as $theme )
                                 $allowed_themes[ $theme ] = true;
-                        update_site_option( 'allowedthemes', $allowed_themes );
+                        update_network_option( 'allowedthemes', $allowed_themes );
                         wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
                         exit;
                 case 'disable-selected':
@@ -67 +67 @@
                         }
                         foreach ( (array) $themes as $theme )
                                 unset( $allowed_themes[ $theme ] );
-                        update_site_option( 'allowedthemes', $allowed_themes );
+                        update_network_option( 'allowedthemes', $allowed_themes );
                         wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
                         exit;
                 case 'update-selected' :

wp-admin/network/upgrade.php

@@ -52 +52 @@
                          * @global string $wp_db_version
                          */
                         global $wp_db_version;
-                        update_site_option( 'wpmu_upgrade_site', $wp_db_version );
+                        update_network_option( 'wpmu_upgrade_site', $wp_db_version );
                 }
 
                 $blogs = $wpdb->get_results( "SELECT blog_id FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' AND spam = '0' AND deleted = '0' AND archived = '0' ORDER BY registered DESC LIMIT {$n}, 5", ARRAY_A );
@@ -109 +109 @@
         break;
         case 'show':
         default:
-                if ( get_site_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
+                if ( get_network_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
                 ?>
                 <h3><?php _e( 'Database Upgrade Required' ); ?></h3>
                 <p><?php _e( 'WordPress has been updated! Before we send you on your way, we need to individually upgrade the sites in your network.' ); ?></p>

wp-admin/options-writing.php

@@ -56 +56 @@
 <?php settings_fields('writing'); ?>
 
 <table class="form-table">
-<?php if ( get_site_option( 'initial_db_version' ) < 32453 ) : ?>
+<?php if ( get_network_option( 'initial_db_version' ) < 32453 ) : ?>
 <tr>
 <th scope="row"><?php _e('Formatting') ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Formatting') ?></span></legend>

wp-admin/options.php

@@ -95 +95 @@
 if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
         $whitelist_options['reading'][] = 'blog_charset';
 
-if ( get_site_option( 'initial_db_version' ) < 32453 ) {
+if ( get_network_option( 'initial_db_version' ) < 32453 ) {
         $whitelist_options['writing'][] = 'use_smilies';
         $whitelist_options['writing'][] = 'use_balanceTags';
 }

wp-admin/user-edit.php

@@ -316 +316 @@
 if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?>
 <tr class="user-super-admin-wrap"><th><?php _e('Super Admin'); ?></th>
 <td>
-<?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
+<?php if ( $profileuser->user_email != get_network_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
 <p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
 <?php else : ?>
 <p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>

wp-includes/capabilities-functions.php

@@ -335 +335 @@
                 $caps[] = $cap;
                 if ( is_multisite() ) {
                         // update_, install_, and delete_ are handled above with is_super_admin().
-                        $menu_perms = get_site_option( 'menu_items', array() );
+                        $menu_perms = get_network_option( 'menu_items', array() );
                         if ( empty( $menu_perms['plugins'] ) )
                                 $caps[] = 'manage_network_plugins';
                 }
@@ -351 +351 @@
         case 'create_users':
                 if ( !is_multisite() )
                         $caps[] = $cap;
-                elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
+                elseif ( is_super_admin( $user_id ) || get_network_option( 'add_new_users' ) )
                         $caps[] = $cap;
                 else
                         $caps[] = 'do_not_allow';
@@ -577 +577 @@
         if ( isset($super_admins) )
                 return $super_admins;
         else
-                return get_site_option( 'site_admins', array('admin') );
+                return get_network_option( 'site_admins', array('admin') );
 }
 
 /**

wp-includes/class-wp-theme.php

@@ -1191 +1191 @@
         public static function get_allowed_on_network() {
                 static $allowed_themes;
                 if ( ! isset( $allowed_themes ) )
-                        $allowed_themes = (array) get_site_option( 'allowedthemes' );
+                        $allowed_themes = (array) get_network_option( 'allowedthemes' );
                 return $allowed_themes;
         }
 

wp-includes/default-constants.php

@@ -189 +189 @@
          * @since 1.5.0
          */
         if ( !defined( 'COOKIEHASH' ) ) {
-                $siteurl = get_site_option( 'siteurl' );
+                $siteurl = get_network_option( 'siteurl' );
                 if ( $siteurl )
                         define( 'COOKIEHASH', md5( $siteurl ) );
                 else

wp-includes/functions.php

@@ -1749 +1749 @@
          * Honor the value of UPLOADS. This happens as long as ms-files rewriting is disabled.
          * We also sometimes obey UPLOADS when rewriting is enabled -- see the next block.
          */
-        if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) ) {
+        if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_network_option( 'ms_files_rewriting' ) ) ) {
                 $dir = ABSPATH . UPLOADS;
                 $url = trailingslashit( $siteurl ) . UPLOADS;
         }
@@ -1757 +1757 @@
         // If multisite (and if not the main site in a post-MU network)
         if ( is_multisite() && ! ( is_main_network() && is_main_site() && defined( 'MULTISITE' ) ) ) {
 
-                if ( ! get_site_option( 'ms_files_rewriting' ) ) {
+                if ( ! get_network_option( 'ms_files_rewriting' ) ) {
                         /*
                          * If ms-files rewriting is disabled (networks created post-3.5), it is fairly
                          * straightforward: Append sites/%d if we're not on the main site (for post-MU
@@ -4004 +4004 @@
                 if ( ! is_null( $filter ) )
                         $global_terms = (bool) $filter;
                 else
-                        $global_terms = (bool) get_site_option( 'global_terms_enabled', false );
+                        $global_terms = (bool) get_network_option( 'global_terms_enabled', false );
         }
         return $global_terms;
 }

wp-includes/l10n.php

@@ -53 +53 @@
         if ( is_multisite() ) {
                 // Don't check blog option when installing.
                 if ( defined( 'WP_INSTALLING' ) || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) {
-                        $ms_locale = get_site_option( 'WPLANG' );
+                        $ms_locale = get_network_option( 'WPLANG' );
                 }
 
                 if ( $ms_locale !== false ) {

wp-includes/ms-default-constants.php

@@ -23 +23 @@
         // This filter is attached in ms-default-filters.php but that file is not included during SHORTINIT.
         add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
 
-        if ( ! get_site_option( 'ms_files_rewriting' ) )
+        if ( ! get_network_option( 'ms_files_rewriting' ) )
                 return;
 
         // Base uploads dir relative to ABSPATH

wp-includes/ms-deprecated.php

@@ -25 +25 @@
  */
 function get_dashboard_blog() {
     _deprecated_function( __FUNCTION__, '3.1' );
-    if ( $blog = get_site_option( 'dashboard_blog' ) )
+    if ( $blog = get_network_option( 'dashboard_blog' ) )
         return get_blog_details( $blog );
 
     return get_blog_details( $GLOBALS['current_site']->blog_id );

wp-includes/ms-functions.php

@@ -125 +125 @@
  * @return int
  */
 function get_user_count() {
-        return get_site_option( 'user_count' );
+        return get_network_option( 'user_count' );
 }
 
 /**
@@ -142 +142 @@
         if ( func_num_args() )
                 _deprecated_argument( __FUNCTION__, '3.1' );
 
-        return get_site_option( 'blog_count' );
+        return get_network_option( 'blog_count' );
 }
 
 /**
@@ -402 +402 @@
  * @return bool Returns true when the email address is banned.
  */
 function is_email_address_unsafe( $user_email ) {
-        $banned_names = get_site_option( 'banned_email_domains' );
+        $banned_names = get_network_option( 'banned_email_domains' );
         if ( $banned_names && ! is_array( $banned_names ) )
                 $banned_names = explode( "\n", $banned_names );
 
@@ -480 +480 @@
         if ( empty( $user_name ) )
                 $errors->add('user_name', __( 'Please enter a username.' ) );
 
-        $illegal_names = get_site_option( 'illegal_names' );
+        $illegal_names = get_network_option( 'illegal_names' );
         if ( ! is_array( $illegal_names ) ) {
                 $illegal_names = array(  'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
-                add_site_option( 'illegal_names', $illegal_names );
+                add_network_option( 'illegal_names', $illegal_names );
         }
         if ( in_array( $user_name, $illegal_names ) )
                 $errors->add('user_name',  __( 'That username is not allowed.' ) );
@@ -508 +508 @@
         if ( !is_email( $user_email ) )
                 $errors->add('user_email', __( 'Please enter a valid email address.' ) );
 
-        $limited_email_domains = get_site_option( 'limited_email_domains' );
+        $limited_email_domains = get_network_option( 'limited_email_domains' );
         if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
                 $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
                 if ( ! in_array( $emaildomain, $limited_email_domains ) ) {
@@ -602 +602 @@
         $blog_title = substr( $blog_title, 0, 50 );
 
         $errors = new WP_Error();
-        $illegal_names = get_site_option( 'illegal_names' );
+        $illegal_names = get_network_option( 'illegal_names' );
         if ( $illegal_names == false ) {
                 $illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
-                add_site_option( 'illegal_names', $illegal_names );
+                add_network_option( 'illegal_names', $illegal_names );
         }
 
         /*
@@ -858 +858 @@
                 $activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
 
         $activate_url = esc_url($activate_url);
-        $admin_email = get_site_option( 'admin_email' );
+        $admin_email = get_network_option( 'admin_email' );
         if ( $admin_email == '' )
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-        $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
+        $from_name = get_network_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_network_option( 'site_name' ) );
         $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = sprintf(
                 /**
@@ -951 +951 @@
                 return false;
 
         // Send email with activation link.
-        $admin_email = get_site_option( 'admin_email' );
+        $admin_email = get_network_option( 'admin_email' );
         if ( $admin_email == '' )
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-        $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
+        $from_name = get_network_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_network_option( 'site_name' ) );
         $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = sprintf(
                 /**
@@ -1192 +1192 @@
                         update_option( $key, $value );
         }
 
-        add_option( 'WPLANG', get_site_option( 'WPLANG' ) );
+        add_option( 'WPLANG', get_network_option( 'WPLANG' ) );
         update_option( 'blog_public', (int) $meta['public'] );
 
         if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) )
@@ -1228 +1228 @@
  * @return bool
  */
 function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
-        if ( get_site_option( 'registrationnotification' ) != 'yes' )
+        if ( get_network_option( 'registrationnotification' ) != 'yes' )
                 return false;
 
-        $email = get_site_option( 'admin_email' );
+        $email = get_network_option( 'admin_email' );
         if ( is_email($email) == false )
                 return false;
 
@@ -1273 +1273 @@
  * @return bool
  */
 function newuser_notify_siteadmin( $user_id ) {
-        if ( get_site_option( 'registrationnotification' ) != 'yes' )
+        if ( get_network_option( 'registrationnotification' ) != 'yes' )
                 return false;
 
-        $email = get_site_option( 'admin_email' );
+        $email = get_network_option( 'admin_email' );
 
         if ( is_email($email) == false )
                 return false;
@@ -1412 +1412 @@
         update_option( 'siteurl', $url );
         update_option( 'home', $url );
 
-        if ( get_site_option( 'ms_files_rewriting' ) )
+        if ( get_network_option( 'ms_files_rewriting' ) )
                 update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
         else
                 update_option( 'upload_path', get_blog_option( get_current_site()->blog_id, 'upload_path' ) );
@@ -1488 +1488 @@
         if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) )
                 return false;
 
-        $welcome_email = get_site_option( 'welcome_email' );
+        $welcome_email = get_network_option( 'welcome_email' );
         if ( $welcome_email == false ) {
                 /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
                 $welcome_email = __( 'Howdy USERNAME,
@@ -1531 +1531 @@
          * @param array  $meta          Signup meta data.
          */
         $welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
-        $admin_email = get_site_option( 'admin_email' );
+        $admin_email = get_network_option( 'admin_email' );
 
         if ( $admin_email == '' )
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-        $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
+        $from_name = get_network_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_network_option( 'site_name' ) );
         $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = $welcome_email;
 
@@ -1587 +1587 @@
         if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) )
                 return false;
 
-        $welcome_email = get_site_option( 'welcome_user_email' );
+        $welcome_email = get_network_option( 'welcome_user_email' );
 
         $user = get_userdata( $user_id );
 
@@ -1609 +1609 @@
         $welcome_email = str_replace( 'PASSWORD', $password, $welcome_email );
         $welcome_email = str_replace( 'LOGINLINK', wp_login_url(), $welcome_email );
 
-        $admin_email = get_site_option( 'admin_email' );
+        $admin_email = get_network_option( 'admin_email' );
 
         if ( $admin_email == '' )
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-        $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
+        $from_name = get_network_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_network_option( 'site_name' ) );
         $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = $welcome_email;
 
@@ -1786 +1786 @@
  * @return array
  */
 function check_upload_mimes( $mimes ) {
-        $site_exts = explode( ' ', get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) );
+        $site_exts = explode( ' ', get_network_option( 'upload_filetypes', 'jpg jpeg png gif' ) );
         $site_mimes = array();
         foreach ( $site_exts as $ext ) {
                 foreach ( $mimes as $ext_pattern => $mime ) {
@@ -1925 +1925 @@
  * @return string|array If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
  */
 function upload_is_file_too_big( $upload ) {
-        if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
+        if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_network_option( 'upload_space_check_disabled' ) )
                 return $upload;
 
-        if ( strlen( $upload['bits'] )  > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
-                return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ));
+        if ( strlen( $upload['bits'] )  > ( 1024 * get_network_option( 'fileupload_maxk', 1500 ) ) )
+                return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_network_option( 'fileupload_maxk', 1500 ));
 
         return $upload;
 }
@@ -2142 +2142 @@
  * @return bool
  */
 function users_can_register_signup_filter() {
-        $registration = get_site_option('registration');
+        $registration = get_network_option('registration');
         return ( $registration == 'all' || $registration == 'user' );
 }
 
@@ -2171 +2171 @@
 Thanks!
 
 --The Team @ SITE_NAME' );
-                update_site_option( 'welcome_user_email', $text );
+                update_network_option( 'welcome_user_email', $text );
         }
         return $text;
 }
@@ -2297 +2297 @@
         global $wpdb;
 
         $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(blog_id) as c FROM $wpdb->blogs WHERE site_id = %d AND spam = '0' AND deleted = '0' and archived = '0'", $wpdb->siteid) );
-        update_site_option( 'blog_count', $count );
+        update_network_option( 'blog_count', $count );
 }
 
 /**
@@ -2311 +2311 @@
         global $wpdb;
 
         $count = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" );
-        update_site_option( 'user_count', $count );
+        update_network_option( 'user_count', $count );
 }
 
 /**
@@ -2349 +2349 @@
         $space_allowed = get_option( 'blog_upload_space' );
 
         if ( ! is_numeric( $space_allowed ) )
-                $space_allowed = get_site_option( 'blog_upload_space' );
+                $space_allowed = get_network_option( 'blog_upload_space' );
 
         if ( empty( $space_allowed ) || ! is_numeric( $space_allowed ) )
                 $space_allowed = 100;
@@ -2373 +2373 @@
  */
 function get_upload_space_available() {
         $space_allowed = get_space_allowed() * 1024 * 1024;
-        if ( get_site_option( 'upload_space_check_disabled' ) )
+        if ( get_network_option( 'upload_space_check_disabled' ) )
                 return $space_allowed;
 
         $space_used = get_space_used() * 1024 * 1024;
@@ -2391 +2391 @@
  * @return bool True if space is available, false otherwise.
  */
 function is_upload_space_available() {
-        if ( get_site_option( 'upload_space_check_disabled' ) )
+        if ( get_network_option( 'upload_space_check_disabled' ) )
                 return true;
 
         return (bool) get_upload_space_available();
@@ -2403 +2403 @@
  * @return int of upload size limit in bytes
  */
 function upload_size_limit_filter( $size ) {
-        $fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 );
-        if ( get_site_option( 'upload_space_check_disabled' ) )
+        $fileupload_maxk = 1024 * get_network_option( 'fileupload_maxk', 1500 );
+        if ( get_network_option( 'upload_space_check_disabled' ) )
                 return min( $size, $fileupload_maxk );
 
         return min( $size, $fileupload_maxk, get_upload_space_available() );

wp-includes/ms-load.php

@@ -34 +34 @@
  * @return array Files to include.
  */
 function wp_get_active_network_plugins() {
-        $active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
+        $active_plugins = (array) get_network_option( 'active_sitewide_plugins', array() );
         if ( empty( $active_plugins ) )
                 return array();
 
@@ -96 +96 @@
                 if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) )
                         return WP_CONTENT_DIR . '/blog-inactive.php';
                 else
-                        wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_current_site()->domain ) ) ) );
+                        wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_network_option( 'admin_email', 'support@' . get_current_site()->domain ) ) ) );
         }
 
         if ( $blog->archived == '1' || $blog->spam == '1' ) {

wp-includes/ms-settings.php

@@ -222 +222 @@
 }
 
 if ( empty( $current_site->site_name ) ) {
-        $current_site->site_name = get_site_option( 'site_name' );
+        $current_site->site_name = get_network_option( 'site_name' );
         if ( ! $current_site->site_name ) {
                 $current_site->site_name = ucfirst( $current_site->domain );
         }

wp-includes/option.php

@@ -976 +976 @@
  *
  * @since 2.8.0
  *
+ * @see get_network_option()
+ *
+ *
+ * @param string $option     Name of option to retrieve. Expected to not be SQL-escaped.
+ * @param mixed  $default    Optional value to return if option doesn't exist. Default false.
+ * @param bool   $deprecated Whether to use cache. Multisite only. Always set to true.
+ * @return mixed Value set for the option.
+ */
+function get_site_option( $option, $default = false, $deprecated = true ) {
+        return get_network_option( $option, $default );
+}
+/**
+ * Add a new site option.
+ *
+ * Existing options will not be updated. Note that prior to 3.3 this wasn't the case.
+ *
+ * @since 2.8.0
+ *
+ * @see add_network_option()
+ *
+ *
+ * @param string $option Name of option to add. Expected to not be SQL-escaped.
+ * @param mixed  $value  Optional. Option value, can be anything. Expected to not be SQL-escaped.
+ * @return bool False if option was not added and true if option was added.
+ */
+function add_site_option( $option, $value ) {
+        return add_network_option( $option, $value );
+}
+/**
+ * Removes site option by name.
+ *
+ * @since 2.8.0
+ *
+ * @see delete_network_option()
+ *
+ *
+ * @param string $option Name of option to remove. Expected to not be SQL-escaped.
+ * @return bool True, if succeed. False, if failure.
+ */
+function delete_site_option( $option ) {
+        return delete_network_option( $option );
+}
+/**
+ * Update the value of a site option that was already added.
+ *
+ * @since 2.8.0
+ *
+ * @see update_network_option()
+ *
+ *
+ * @param string $option Name of option. Expected to not be SQL-escaped.
+ * @param mixed  $value  Option value. Expected to not be SQL-escaped.
+ * @return bool False if value was not updated and true if value was updated.
+ */
+function update_site_option( $option, $value ) {
+        return update_network_option( $option, $value );
+}
+
+/**
+ * Retrieve site option value based on name of option.
+ *
+ * @since 4.4.0
+ *
  * @see get_option()
  *
  * @global wpdb $wpdb
  *
  * @param string $option    Name of option to retrieve. Expected to not be SQL-escaped.
  * @param mixed  $default   Optional value to return if option doesn't exist. Default false.
- * @param bool   $use_cache Whether to use cache. Multisite only. Default true.
+ * @param int|bool    $network_id ID of the network.
  * @return mixed Value set for the option.
  */
-function get_site_option( $option, $default = false, $use_cache = true ) {
+function get_network_option( $option, $default = false, $network_id = true ) {
         global $wpdb;
 
+        /** If network ID not set, get current network. **/
+        if( false === $network_id && is_multisite() ){
+                $current_network = get_current_site();
+                $network_id = $current_network->id;
+        }
+        /** Make sure network id is an int */
+        $network_id = (int) $network_id;
+
         /**
          * Filter an existing site option before it is retrieved.
          *
@@ -1008 +1079 @@
         if ( false !== $pre )
                 return $pre;
 
+        /**
+         * Filter an existing network option before it is retrieved.
+         *
+         * The dynamic portion of the hook name, `$option`, refers to the option name.
+         *
+         * Passing a truthy value to the filter will effectively short-circuit retrieval,
+         * returning the passed value instead.
+         *
+         * @since 4.4.0
+         *
+         * @param mixed  $pre_option The default value to return if the option does not exist.
+         * @param string $option     Option name.
+         * @param int    $network_id ID of the network.
+         *
+         */
+        $pre = apply_filters( 'pre_network_option_' . $option, false, $option, $network_id );
+
+        if ( false !== $pre )
+                return $pre;
+
         // prevent non-existent options from triggering multiple queries
-        $notoptions_key = "{$wpdb->siteid}:notoptions";
+        $notoptions_key = "{$network_id}:notoptions";
         $notoptions = wp_cache_get( $notoptions_key, 'site-options' );
 
         if ( isset( $notoptions[$option] ) ) {
@@ -1026 +1117 @@
                  *                        in the database.
                  * @param string $option  Option name.
                  */
-                return apply_filters( 'default_site_option_' . $option, $default, $option );
+                $default = apply_filters( 'default_site_option_' . $option, $default, $option );
+
+                /**
+                 * Filter a specific default network option.
+                 *
+                 * The dynamic portion of the hook name, `$option`, refers to the option name.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param mixed  $default The value to return if the site option does not exist
+                 *                        in the database.
+                 * @param string $option  Option name.
+                 * @param int    $network_id ID of the network.
+                 */
+                return apply_filters( 'default_network_option_' . $option, $default, $option, $network_id );
         }
 
         if ( ! is_multisite() ) {
 
                 /** This filter is documented in wp-includes/option.php */
                 $default = apply_filters( 'default_site_option_' . $option, $default, $option );
+                /** This filter is documented in wp-includes/option.php */
+                $default = apply_filters( 'default_network_option_' . $option, $default, $option, $network_id );
                 $value = get_option($option, $default);
         } else {
-                $cache_key = "{$wpdb->siteid}:$option";
-                if ( $use_cache )
-                        $value = wp_cache_get($cache_key, 'site-options');
+                $cache_key = "{$network_id}:$option";
+                $value = wp_cache_get($cache_key, 'site-options');
 
-                if ( !isset($value) || (false === $value) ) {
-                        $row = $wpdb->get_row( $wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) );
+                if ( false === $value ) {
+                        $row = $wpdb->get_row( $wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $network_id ) );
 
                         // Has to be get_row instead of get_var because of funkiness with 0, false, null values
                         if ( is_object( $row ) ) {
@@ -1056 +1162 @@
 
                                 /** This filter is documented in wp-includes/option.php */
                                 $value = apply_filters( 'default_site_option_' . $option, $default, $option );
+                                /** This filter is documented in wp-includes/option.php */
+                                $value = apply_filters( 'default_network_option_' . $option, $value, $option, $network_id );
                         }
                 }
         }
 
+
         /**
          * Filter the value of an existing site option.
          *
@@ -1072 +1181 @@
          * @param mixed  $value  Value of site option.
          * @param string $option Option name.
          */
-        return apply_filters( 'site_option_' . $option, $value, $option );
+        $value = apply_filters( 'site_option_' . $option, $value, $option );
+
+        /**
+         * Filter the value of an existing network option.
+         *
+         * The dynamic portion of the hook name, `$option`, refers to the option name.
+         *
+         * @since 4.4.0
+         *
+         * @param mixed  $value  Value of site option.
+         * @param string $option Option name.
+         * @param int    $network_id ID of the network.
+         */
+        return apply_filters( 'network_option_' . $option, $value, $option, $network_id );
 }
 
 /**
- * Add a new site option.
+ * Add a new network option.
  *
  * Existing options will not be updated. Note that prior to 3.3 this wasn't the case.
  *
- * @since 2.8.0
+ * @since 4.4.0
  *
  * @see add_option()
  *
@@ -1088 +1210 @@
  *
  * @param string $option Name of option to add. Expected to not be SQL-escaped.
  * @param mixed  $value  Optional. Option value, can be anything. Expected to not be SQL-escaped.
+ * @param  int|bool   $network_id ID of the network.
  * @return bool False if option was not added and true if option was added.
  */
-function add_site_option( $option, $value ) {
+function add_network_option( $option, $value, $network_id = false ) {
         global $wpdb;
 
+        /** If network ID not set, get current network. **/
+        if( false === $network_id && is_multisite() ){
+                $current_network = get_current_site();
+                $network_id = $current_network->id;
+        }
+        /** Make sure network id is an int */
+        $network_id = (int) $network_id;
+
         wp_protect_special_option( $option );
 
         /**
@@ -1109 +1240 @@
          */
         $value = apply_filters( 'pre_add_site_option_' . $option, $value, $option );
 
-        $notoptions_key = "{$wpdb->siteid}:notoptions";
+        /**
+         * Filter the value of a specific network option before it is added.
+         *
+         * The dynamic portion of the hook name, `$option`, refers to the option name.
+         *
+         * @since 4.4.0
+         *
+         * @param mixed  $value  Value of site option.
+         * @param string $option Option name.
+         * @param  int   $network_id ID of the network.
+         */
+        $value = apply_filters( 'pre_add_network_option_' . $option, $value, $option, $network_id );
+
+        $notoptions_key = "{$network_id}:notoptions";
 
         if ( !is_multisite() ) {
                 $result = add_option( $option, $value );
         } else {
-                $cache_key = "{$wpdb->siteid}:$option";
+                $cache_key = "{$network_id}:$option";
 
                 // Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
                 $notoptions = wp_cache_get( $notoptions_key, 'site-options' );
                 if ( ! is_array( $notoptions ) || ! isset( $notoptions[$option] ) )
-                        if ( false !== get_site_option( $option ) )
+                        if ( false !== get_network_option( $option, false, $network_id ) )
                                 return false;
 
                 $value = sanitize_option( $option, $value );
 
                 $serialized_value = maybe_serialize( $value );
-                $result = $wpdb->insert( $wpdb->sitemeta, array('site_id' => $wpdb->siteid, 'meta_key' => $option, 'meta_value' => $serialized_value ) );
+                $result = $wpdb->insert( $wpdb->sitemeta, array('site_id' => $network_id, 'meta_key' => $option, 'meta_value' => $serialized_value ) );
 
                 if ( ! $result )
                         return false;
@@ -1156 +1300 @@
                 do_action( "add_site_option_{$option}", $option, $value );
 
                 /**
+                 * Fires after a specific network option has been successfully added.
+                 *
+                 * The dynamic portion of the hook name, `$option`, refers to the option name.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param string $option Name of site option.
+                 * @param mixed  $value  Value of site option.
+                 * @param  int    $network_id ID of the network.
+                 */
+                do_action( "add_network_option_{$option}", $option, $value, $network_id );
+
+                /**
                  * Fires after a site option has been successfully added.
                  *
                  * @since 3.0.0
@@ -1165 +1322 @@
                  */
                 do_action( "add_site_option", $option, $value );
 
+                /**
+                 * Fires after a network option has been successfully added.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param string $option Name of site option.
+                 * @param mixed  $value  Value of site option.
+                 * @param int    $network_id ID of the network.
+                 */
+                do_action( "add_network_option", $option, $value, $network_id );
+
                 return true;
         }
         return false;
 }
 
 /**
- * Removes site option by name.
+ * Removes network option by name.
  *
- * @since 2.8.0
+ * @since 4.4.0
  *
  * @see delete_option()
  *
  * @global wpdb $wpdb
  *
- * @param string $option Name of option to remove. Expected to not be SQL-escaped.
+ * @param  string $option Name of option to remove. Expected to not be SQL-escaped.
+ * @param  int|bool    $network_id ID of the network.
  * @return bool True, if succeed. False, if failure.
  */
-function delete_site_option( $option ) {
+function delete_network_option( $option, $network_id = false ) {
         global $wpdb;
 
+        /** If network ID not set, get current network. **/
+        if( false === $network_id && is_multisite() ){
+                $current_network = get_current_site();
+                $network_id = $current_network->id;
+        }
+        /** Make sure network id is an int */
+        $network_id = (int) $network_id;
+
         // ms_protect_special_option( $option ); @todo
 
         /**
@@ -1199 +1376 @@
          */
         do_action( 'pre_delete_site_option_' . $option, $option );
 
+        /**
+         * Fires immediately before a specific network option is deleted.
+         *
+         * The dynamic portion of the hook name, `$option`, refers to the option name.
+         *
+         * @since 4.4.0 The `$option` parameter was added
+         *
+         * @param string $option Option name.
+         * @param int    $network_id ID of the network.
+         */
+        do_action( 'pre_delete_network_option_' . $option, $option, $network_id );
+
         if ( !is_multisite() ) {
                 $result = delete_option( $option );
         } else {
-                $row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) );
+                $row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $network_id ) );
                 if ( is_null( $row ) || !$row->meta_id )
                         return false;
-                $cache_key = "{$wpdb->siteid}:$option";
+                $cache_key = "{$network_id}:$option";
                 wp_cache_delete( $cache_key, 'site-options' );
 
-                $result = $wpdb->delete( $wpdb->sitemeta, array( 'meta_key' => $option, 'site_id' => $wpdb->siteid ) );
+                $result = $wpdb->delete( $wpdb->sitemeta, array( 'meta_key' => $option, 'site_id' => $network_id ) );
         }
 
         if ( $result ) {
@@ -1226 +1415 @@
                 do_action( "delete_site_option_{$option}", $option );
 
                 /**
+                 * Fires after a specific network option has been deleted.
+                 *
+                 * The dynamic portion of the hook name, `$option`, refers to the option name.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param string $option Name of the site option.
+                 * @param int    $network_id ID of the network.
+                 */
+                do_action( "delete_network_option_{$option}", $option, $network_id );
+
+                /**
                  * Fires after a site option has been deleted.
                  *
                  * @since 3.0.0
@@ -1234 +1435 @@
                  */
                 do_action( "delete_site_option", $option );
 
+                /**
+                 * Fires after a network option has been deleted.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param string $option Name of the site option.
+                 * @param int    $network_id ID of the network.
+                 */
+                do_action( "delete_network_option", $option, $network_id );
+
                 return true;
         }
         return false;
 }
 
 /**
- * Update the value of a site option that was already added.
+ * Update the value of a network option that was already added.
  *
- * @since 2.8.0
+ * @since 4.4.0
  *
  * @see update_option()
  *
@@ -1250 +1461 @@
  *
  * @param string $option Name of option. Expected to not be SQL-escaped.
  * @param mixed  $value  Option value. Expected to not be SQL-escaped.
+ * @param  int|bool    $network_id ID of the network.
  * @return bool False if value was not updated and true if value was updated.
  */
-function update_site_option( $option, $value ) {
+function update_network_option( $option, $value, $network_id = false ) {
         global $wpdb;
 
+        /** If network ID not set, get current network. **/
+        if( false === $network_id && is_multisite() ){
+                $current_network = get_current_site();
+                $network_id = $current_network->id;
+        }
+        /** Make sure network id is an int */
+        $network_id = (int) $network_id;
+
         wp_protect_special_option( $option );
 
-        $old_value = get_site_option( $option );
+        $old_value = get_network_option( $option, false, $network_id );
 
         /**
          * Filter a specific site option before its value is updated.
@@ -1277 +1497 @@
         if ( $value === $old_value )
                 return false;
 
+        /**
+         * Filter a specific network option before its value is updated.
+         *
+         * The dynamic portion of the hook name, `$option`, refers to the option name.
+         *
+         * @since 4.4.0
+         *
+         * @param mixed  $value     New value of site option.
+         * @param mixed  $old_value Old value of site option.
+         * @param string $option    Option name.
+         * @param int    $network_id ID of the network.
+         */
+        $value = apply_filters( 'pre_update_network_option_' . $option, $value, $old_value, $option, $network_id );
+
+        if ( $value === $old_value )
+                return false;
+
         if ( false === $old_value )
-                return add_site_option( $option, $value );
+                return add_network_option( $option, $value, $network_id );
 
-        $notoptions_key = "{$wpdb->siteid}:notoptions";
+        $notoptions_key = "{$network_id}:notoptions";
         $notoptions = wp_cache_get( $notoptions_key, 'site-options' );
         if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
                 unset( $notoptions[$option] );
@@ -1293 +1530 @@
                 $value = sanitize_option( $option, $value );
 
                 $serialized_value = maybe_serialize( $value );
-                $result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array( 'site_id' => $wpdb->siteid, 'meta_key' => $option ) );
+                $result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array( 'site_id' => $network_id, 'meta_key' => $option ) );
 
                 if ( $result ) {
-                        $cache_key = "{$wpdb->siteid}:$option";
+                        $cache_key = "{$network_id}:$option";
                         wp_cache_set( $cache_key, $value, 'site-options' );
                 }
         }
@@ -1317 +1554 @@
                  */
                 do_action( "update_site_option_{$option}", $option, $value, $old_value );
 
+
+                /**
+                 * Fires after the value of a specific network option has been successfully updated.
+                 *
+                 * The dynamic portion of the hook name, `$option`, refers to the option name.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param string $option     Name of site option.
+                 * @param mixed  $value      Current value of site option.
+                 * @param mixed  $old_value  Old value of site option.
+                 * @param int    $network_id ID of the network.
+                 */
+                do_action( "update_network_option_{$option}", $option, $value, $old_value, $network_id );
+
+                /**
+                 * Fires after the value of a specific network option has been successfully updated.
+                 *
+                 * The dynamic portion of the hook name, `$option`, refers to the option name.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param string $option    Name of site option.
+                 * @param mixed  $value     Current value of site option.
+                 * @param mixed  $old_value Old value of site option.
+                 * @param int  $network_id ID of the network.
+                 */
+                do_action( "update_network_option_{$option}", $option, $value, $old_value, $network_id );
+
                 /**
                  * Fires after the value of a site option has been successfully updated.
                  *
@@ -1328 +1594 @@
                  */
                 do_action( "update_site_option", $option, $value, $old_value );
 
+                /**
+                 * Fires after the value of a network option has been successfully updated.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param string $option    Name of site option.
+                 * @param mixed  $value     Current value of site option.
+                 * @param mixed  $old_value Old value of site option.
+                 * @param int    $network_id ID of the network.
+                 */
+                do_action( "update_network_option", $option, $value, $old_value, $network_id );
+
                 return true;
         }
         return false;
@@ -1359 +1637 @@
         } else {
                 $option_timeout = '_site_transient_timeout_' . $transient;
                 $option = '_site_transient_' . $transient;
-                $result = delete_site_option( $option );
+                $result = delete_network_option( $option );
                 if ( $result )
-                        delete_site_option( $option_timeout );
+                        delete_network_option( $option_timeout );
         }
         if ( $result ) {
 
@@ -1422 +1700 @@
                 $transient_option = '_site_transient_' . $transient;
                 if ( ! in_array( $transient, $no_timeout ) ) {
                         $transient_timeout = '_site_transient_timeout_' . $transient;
-                        $timeout = get_site_option( $transient_timeout );
+                        $timeout = get_network_option( $transient_timeout );
                         if ( false !== $timeout && $timeout < time() ) {
-                                delete_site_option( $transient_option  );
-                                delete_site_option( $transient_timeout );
+                                delete_network_option( $transient_option  );
+                                delete_network_option( $transient_timeout );
                                 $value = false;
                         }
                 }
 
                 if ( ! isset( $value ) )
-                        $value = get_site_option( $transient_option );
+                        $value = get_network_option( $transient_option );
         }
 
         /**
@@ -1486 +1764 @@
         } else {
                 $transient_timeout = '_site_transient_timeout_' . $transient;
                 $option = '_site_transient_' . $transient;
-                if ( false === get_site_option( $option ) ) {
+                if ( false === get_network_option( $option ) ) {
                         if ( $expiration )
-                                add_site_option( $transient_timeout, time() + $expiration );
-                        $result = add_site_option( $option, $value );
+                                add_network_option( $transient_timeout, time() + $expiration );
+                        $result = add_network_option( $option, $value );
                 } else {
                         if ( $expiration )
-                                update_site_option( $transient_timeout, time() + $expiration );
-                        $result = update_site_option( $option, $value );
+                                update_network_option( $transient_timeout, time() + $expiration );
+                        $result = update_network_option( $option, $value );
                 }
         }
         if ( $result ) {

wp-includes/pluggable.php

@@ -1961 +1961 @@
                         if ( defined( $const ) && constant( $const ) && empty( $duplicated_keys[ constant( $const ) ] ) ) {
                                 $values[ $type ] = constant( $const );
                         } elseif ( ! $values[ $type ] ) {
-                                $values[ $type ] = get_site_option( "{$scheme}_{$type}" );
+                                $values[ $type ] = get_network_option( "{$scheme}_{$type}" );
                                 if ( ! $values[ $type ] ) {
                                         $values[ $type ] = wp_generate_password( 64, true, true );
-                                        update_site_option( "{$scheme}_{$type}", $values[ $type ] );
+                                        update_network_option( "{$scheme}_{$type}", $values[ $type ] );
                                 }
                         }
                 }
         } else {
                 if ( ! $values['key'] ) {
-                        $values['key'] = get_site_option( 'secret_key' );
+                        $values['key'] = get_network_option( 'secret_key' );
                         if ( ! $values['key'] ) {
                                 $values['key'] = wp_generate_password( 64, true, true );
-                                update_site_option( 'secret_key', $values['key'] );
+                                update_network_option( 'secret_key', $values['key'] );
                         }
                 }
                 $values['salt'] = hash_hmac( 'md5', $scheme, $values['key'] );

wp-includes/script-loader.php

@@ -1149 +1149 @@
 
         if ( ! isset($compress_scripts) ) {
                 $compress_scripts = defined('COMPRESS_SCRIPTS') ? COMPRESS_SCRIPTS : true;
-                if ( $compress_scripts && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
+                if ( $compress_scripts && ( ! get_network_option('can_compress_scripts') || $compressed_output ) )
                         $compress_scripts = false;
         }
 
         if ( ! isset($compress_css) ) {
                 $compress_css = defined('COMPRESS_CSS') ? COMPRESS_CSS : true;
-                if ( $compress_css && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
+                if ( $compress_css && ( ! get_network_option('can_compress_scripts') || $compressed_output ) )
                         $compress_css = false;
         }
 }

wp-includes/user-functions.php

@@ -1773 +1773 @@
  */
 function wp_get_user_contact_methods( $user = null ) {
         $methods = array();
-        if ( get_site_option( 'initial_db_version' ) < 23588 ) {
+        if ( get_network_option( 'initial_db_version' ) < 23588 ) {
                 $methods = array(
                         'aim'    => __( 'AIM' ),
                         'yim'    => __( 'Yahoo IM' ),

wp-signup.php

@@ -7 +7 @@
 
 require( dirname( __FILE__ ) . '/wp-blog-header.php' );
 
-if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) ) {
+if ( is_array( get_network_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_network_option( 'illegal_names' ) ) ) {
         wp_redirect( network_home_url() );
         die();
 }
@@ -643 +643 @@
 }
 
 // Main
-$active_signup = get_site_option( 'registration', 'none' );
+$active_signup = get_network_option( 'registration', 'none' );
 /**
  * Filter the type of site sign-up.
  *