Changeset 34912

Timestamp:

10/07/2015 05:11:01 PM (11 years ago)

Author:

jeremyfelt

Message:

Revert [34778], continue using _site_option() for the current network.

The _network_option() parameter order will be changing to accept $network_id first. The _site_option() functions will remain in use throughout core as our way of retrieving a network option for the current network.

See #28290.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-admin/includes/class-wp-plugins-list-table.php (modified) (2 diffs)
• wp-admin/includes/class-wp-themes-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-upgrader.php (modified) (7 diffs)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-admin/includes/ms.php (modified) (10 diffs)
• wp-admin/includes/network.php (modified) (2 diffs)
• wp-admin/includes/plugin.php (modified) (6 diffs)
• wp-admin/includes/schema.php (modified) (2 diffs)
• wp-admin/includes/update-core.php (modified) (1 diff)
• wp-admin/includes/update.php (modified) (5 diffs)
• wp-admin/includes/upgrade.php (modified) (11 diffs)
• wp-admin/network/settings.php (modified) (20 diffs)
• wp-admin/network/site-new.php (modified) (2 diffs)
• wp-admin/network/themes.php (modified) (4 diffs)
• wp-admin/network/upgrade.php (modified) (2 diffs)
• wp-admin/options-writing.php (modified) (1 diff)
• wp-admin/options.php (modified) (1 diff)
• wp-admin/plugin-editor.php (modified) (1 diff)
• wp-admin/plugins.php (modified) (6 diffs)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-includes/capabilities-functions.php (modified) (3 diffs)
• wp-includes/class-wp-theme.php (modified) (1 diff)
• wp-includes/default-constants.php (modified) (1 diff)
• wp-includes/functions.php (modified) (3 diffs)
• wp-includes/l10n.php (modified) (1 diff)
• wp-includes/ms-default-constants.php (modified) (1 diff)
• wp-includes/ms-deprecated.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (26 diffs)
• wp-includes/ms-load.php (modified) (2 diffs)
• wp-includes/option.php (modified) (5 diffs)
• wp-includes/pluggable.php (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (2 diffs)
• wp-includes/user-functions.php (modified) (1 diff)
• wp-signup.php (modified) (2 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

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

trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -131 +131 @@
 
                 if ( $screen->in_admin( 'network' ) ) {
-                        $recently_activated = get_network_option( 'recently_activated', array() );
+                        $recently_activated = get_site_option( 'recently_activated', array() );
                 } else {
                         $recently_activated = get_option( 'recently_activated', array() );
@@ -143 +143 @@
 
                 if ( $screen->in_admin( 'network' ) ) {
-                        update_network_option( 'recently_activated', $recently_activated );
+                        update_site_option( 'recently_activated', $recently_activated );
                 } else {
                         update_option( 'recently_activated', $recently_activated );

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

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

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

@@ -2369 +2369 @@
                         return false;
 
-                $failure_data = get_network_option( 'auto_core_update_failed' );
+                $failure_data = get_site_option( 'auto_core_update_failed' );
                 if ( $failure_data ) {
                         // If this was a critical update failure, cannot update.
@@ -2781 +2781 @@
          */
         protected function send_core_update_notification_email( $item ) {
-                $notified = get_network_option( 'auto_core_update_notified' );
+                $notified = get_site_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_network_option( 'admin_email' ) && $notified['version'] == $item->current )
+                if ( $notified && $notified['email'] == get_site_option( 'admin_email' ) && $notified['version'] == $item->current )
                         return false;
 
@@ -3109 +3109 @@
                                 $critical_data['rollback_data'] = $rollback_result->get_error_data();
                         }
-                        update_network_option( 'auto_core_update_failed', $critical_data );
+                        update_site_option( 'auto_core_update_failed', $critical_data );
                         $this->send_email( 'critical', $core_update, $result );
                         return;
@@ -3127 +3127 @@
                 $send = true;
                 $transient_failures = array( 'incompatible_archive', 'download_failed', 'insane_distro' );
-                if ( in_array( $error_code, $transient_failures ) && ! get_network_option( 'auto_core_update_failed' ) ) {
+                if ( in_array( $error_code, $transient_failures ) && ! get_site_option( 'auto_core_update_failed' ) ) {
                         wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'wp_maybe_auto_update' );
                         $send = false;
                 }
 
-                $n = get_network_option( 'auto_core_update_notified' );
+                $n = get_site_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_network_option( 'admin_email' ) && $n['version'] == $core_update->current )
+                if ( $n && 'fail' == $n['type'] && $n['email'] == get_site_option( 'admin_email' ) && $n['version'] == $core_update->current )
                         $send = false;
 
-                update_network_option( 'auto_core_update_failed', array(
+                update_site_option( 'auto_core_update_failed', array(
                         'attempted'  => $core_update->current,
                         'current'    => $wp_version,
@@ -3163 +3163 @@
          */
         protected function send_email( $type, $core_update, $result = null ) {
-                update_network_option( 'auto_core_update_notified', array(
+                update_site_option( 'auto_core_update_notified', array(
                         'type'      => $type,
-                        'email'     => get_network_option( 'admin_email' ),
+                        'email'     => get_site_option( 'admin_email' ),
                         'version'   => $core_update->current,
                         'timestamp' => time(),
@@ -3321 +3321 @@
                 }
 
-                $to  = get_network_option( 'admin_email' );
+                $to  = get_site_option( 'admin_email' );
                 $headers = '';
 
@@ -3495 +3495 @@
 
                 $email = array(
-                        'to'      => get_network_option( 'admin_email' ),
+                        'to'      => get_site_option( 'admin_email' ),
                         'subject' => $subject,
                         'body'    => implode( "\n", $body ),

trunk/src/wp-admin/includes/dashboard.php

@@ -1197 +1197 @@
 */
 function wp_dashboard_quota() {
-        if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_network_option( 'upload_space_check_disabled' ) )
+        if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) )
                 return true;
 

trunk/src/wp-admin/includes/ms.php

@@ -17 +17 @@
  */
 function check_upload_size( $file ) {
-        if ( get_network_option( 'upload_space_check_disabled' ) )
+        if ( get_site_option( 'upload_space_check_disabled' ) )
                 return $file;
 
@@ -31 +31 @@
         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_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 ( $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 ( upload_is_user_over_quota( false ) ) {
                 $file['error'] = __( 'You have used your space quota. Please delete files before uploading.' );
@@ -99 +99 @@
 
         // If ms_files_rewriting is enabled and upload_path is empty, wp_upload_dir is not reliable.
-        if ( $drop && get_network_option( 'ms_files_rewriting' ) && empty( $upload_path ) ) {
+        if ( $drop && get_site_option( 'ms_files_rewriting' ) && empty( $upload_path ) ) {
                 $drop = false;
         }
@@ -307 +307 @@
         $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_network_option( 'site_name' ), $content );
+        $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
         $content = str_replace( '###SITEURL###', network_home_url(), $content );
 
@@ -386 +386 @@
                 $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_network_option( 'site_name' ), $content );
+                $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
                 $content = str_replace( '###SITEURL###', network_home_url(), $content );
 
@@ -414 +414 @@
  */
 function upload_is_user_over_quota( $echo = true ) {
-        if ( get_network_option( 'upload_space_check_disabled' ) )
+        if ( get_site_option( 'upload_space_check_disabled' ) )
                 return false;
 
@@ -747 +747 @@
         if ( !is_super_admin() )
                 return false;
-        if ( get_network_option( 'wpmu_upgrade_site' ) != $wp_db_version )
+        if ( get_site_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>";
 }
@@ -829 +829 @@
                 </td>
         </tr>
-        <?php if ( in_array( get_network_option( 'registration' ), array( 'all', 'blog' ) ) ) : ?>
+        <?php if ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ) ) ) : ?>
                 <tr>
                         <th scope="row" colspan="2" class="th-full">
@@ -871 +871 @@
 
         // Directly fetch site_admins instead of using get_super_admins()
-        $super_admins = get_network_option( 'site_admins', array( 'admin' ) );
+        $super_admins = get_site_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_network_option( 'site_admins' , $super_admins );
+                update_site_option( 'site_admins' , $super_admins );
 
                 /**
@@ -918 +918 @@
 
         // Directly fetch site_admins instead of using get_super_admins()
-        $super_admins = get_network_option( 'site_admins', array( 'admin' ) );
+        $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
 
         $user = get_userdata( $user_id );
-        if ( $user && 0 !== strcasecmp( $user->user_email, get_network_option( 'admin_email' ) ) ) {
+        if ( $user && 0 !== strcasecmp( $user->user_email, get_site_option( 'admin_email' ) ) ) {
                 if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
                         unset( $super_admins[$key] );
-                        update_network_option( 'site_admins', $super_admins );
+                        update_site_option( 'site_admins', $super_admins );
 
                         /**

trunk/src/wp-admin/includes/network.php

@@ -451 +451 @@
                     <action type="None" />
                 </rule>';
-                                if ( is_multisite() && get_network_option( 'ms_files_rewriting' ) ) {
+                                if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
                                         $web_config_file .= '
                 <rule name="WordPress Rule for Files" stopProcessing="true">
@@ -507 +507 @@
 
                 $ms_files_rewriting = '';
-                if ( is_multisite() && get_network_option( 'ms_files_rewriting' ) ) {
+                if ( is_multisite() && get_site_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";

trunk/src/wp-admin/includes/plugin.php

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

trunk/src/wp-admin/includes/schema.php

@@ -936 +936 @@
                 }
         } else {
-                $site_admins = get_network_option( 'site_admins' );
+                $site_admins = get_site_option( 'site_admins' );
         }
 
@@ -986 +986 @@
                 'siteurl' => get_option( 'siteurl' ) . '/',
                 'add_new_users' => '0',
-                'upload_space_check_disabled' => is_multisite() ? get_network_option( 'upload_space_check_disabled' ) : '1',
+                'upload_space_check_disabled' => is_multisite() ? get_site_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_network_option( 'ms_files_rewriting' ) : '0',
+                'ms_files_rewriting' => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
                 'initial_db_version' => get_option( 'initial_db_version' ),
                 'active_sitewide_plugins' => array(),

trunk/src/wp-admin/includes/update-core.php

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

trunk/src/wp-admin/includes/update.php

@@ -30 +30 @@
 function get_core_updates( $options = array() ) {
         $options = array_merge( array( 'available' => true, 'dismissed' => false ), $options );
-        $dismissed = get_network_option( 'dismissed_update_core' );
+        $dismissed = get_site_option( 'dismissed_update_core' );
 
         if ( ! is_array( $dismissed ) )
@@ -135 +135 @@
  */
 function dismiss_core_update( $update ) {
-        $dismissed = get_network_option( 'dismissed_update_core' );
+        $dismissed = get_site_option( 'dismissed_update_core' );
         $dismissed[ $update->current . '|' . $update->locale ] = true;
-        return update_network_option( 'dismissed_update_core', $dismissed );
+        return update_site_option( 'dismissed_update_core', $dismissed );
 }
 
@@ -147 +147 @@
  */
 function undismiss_core_update( $version, $locale ) {
-        $dismissed = get_network_option( 'dismissed_update_core' );
+        $dismissed = get_site_option( 'dismissed_update_core' );
         $key = $version . '|' . $locale;
 
@@ -154 +154 @@
 
         unset( $dismissed[$key] );
-        return update_network_option( 'dismissed_update_core', $dismissed );
+        return update_site_option( 'dismissed_update_core', $dismissed );
 }
 
@@ -479 +479 @@
         $nag = isset( $upgrading );
         if ( ! $nag ) {
-                $failed = get_network_option( 'auto_core_update_failed' );
+                $failed = get_site_option( 'auto_core_update_failed' );
                 /*
                  * If an update failed critically, we may have copied over version.php but not other files.

trunk/src/wp-admin/includes/upgrade.php

@@ -154 +154 @@
 
         if ( is_multisite() ) {
-                $first_post = get_network_option( 'first_post' );
+                $first_post = get_site_option( 'first_post' );
 
                 if ( empty($first_post) )
@@ -190 +190 @@
 To delete a comment, just log in and view the post's comments. There you will have the option to edit or delete them.');
         if ( is_multisite() ) {
-                $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 );
+                $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 );
         }
         $wpdb->insert( $wpdb->comments, array(
@@ -215 +215 @@
 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_network_option( 'first_page', $first_page );
+                $first_page = get_site_option( 'first_page', $first_page );
         $first_post_guid = get_option('home') . '/?page_id=2';
         $wpdb->insert( $wpdb->posts, array(
@@ -1256 +1256 @@
                 populate_roles_300();
 
-        if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_network_option( 'siteurl' ) === false )
-                add_network_option( 'siteurl', '' );
+        if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
+                add_site_option( 'siteurl', '' );
 
         // 3.0 screen options key name changes.
@@ -1644 +1644 @@
         // 2.8.
         if ( $wp_current_db_version < 11549 ) {
-                $wpmu_sitewide_plugins = get_network_option( 'wpmu_sitewide_plugins' );
-                $active_sitewide_plugins = get_network_option( 'active_sitewide_plugins' );
+                $wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
+                $active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
                 if ( $wpmu_sitewide_plugins ) {
                         if ( !$active_sitewide_plugins )
@@ -1652 +1652 @@
                                 $sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
 
-                        update_network_option( 'active_sitewide_plugins', $sitewide_plugins );
-                }
-                delete_network_option( 'wpmu_sitewide_plugins' );
-                delete_network_option( 'deactivated_sitewide_plugins' );
+                        update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
+                }
+                delete_site_option( 'wpmu_sitewide_plugins' );
+                delete_site_option( 'deactivated_sitewide_plugins' );
 
                 $start = 0;
@@ -1664 +1664 @@
                                         $value = stripslashes( $value );
                                 if ( $value !== $row->meta_value ) {
-                                        update_network_option( $row->meta_key, $value );
+                                        update_site_option( $row->meta_key, $value );
                                 }
                         }
@@ -1673 +1673 @@
         // 3.0
         if ( $wp_current_db_version < 13576 )
-                update_network_option( 'global_terms_enabled', '1' );
+                update_site_option( 'global_terms_enabled', '1' );
 
         // 3.3
         if ( $wp_current_db_version < 19390 )
-                update_network_option( 'initial_db_version', $wp_current_db_version );
+                update_site_option( 'initial_db_version', $wp_current_db_version );
 
         if ( $wp_current_db_version < 19470 ) {
-                if ( false === get_network_option( 'active_sitewide_plugins' ) )
-                        update_network_option( 'active_sitewide_plugins', array() );
+                if ( false === get_site_option( 'active_sitewide_plugins' ) )
+                        update_site_option( 'active_sitewide_plugins', array() );
         }
 
@@ -1687 +1687 @@
         if ( $wp_current_db_version < 20148 ) {
                 // 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
-                $allowedthemes  = get_network_option( 'allowedthemes'  );
-                $allowed_themes = get_network_option( 'allowed_themes' );
+                $allowedthemes  = get_site_option( 'allowedthemes'  );
+                $allowed_themes = get_site_option( 'allowed_themes' );
                 if ( false === $allowedthemes && is_array( $allowed_themes ) && $allowed_themes ) {
                         $converted = array();
@@ -1696 +1696 @@
                                         $converted[ $stylesheet ] = true;
                         }
-                        update_network_option( 'allowedthemes', $converted );
-                        delete_network_option( 'allowed_themes' );
+                        update_site_option( 'allowedthemes', $converted );
+                        delete_site_option( 'allowed_themes' );
                 }
         }
@@ -1703 +1703 @@
         // 3.5
         if ( $wp_current_db_version < 21823 )
-                update_network_option( 'ms_files_rewriting', '1' );
+                update_site_option( 'ms_files_rewriting', '1' );
 
         // 3.5.2
         if ( $wp_current_db_version < 24448 ) {
-                $illegal_names = get_network_option( 'illegal_names' );
+                $illegal_names = get_site_option( 'illegal_names' );
                 if ( is_array( $illegal_names ) && count( $illegal_names ) === 1 ) {
                         $illegal_name = reset( $illegal_names );
                         $illegal_names = explode( ' ', $illegal_name );
-                        update_network_option( 'illegal_names', $illegal_names );
+                        update_site_option( 'illegal_names', $illegal_names );
                 }
         }

trunk/src/wp-admin/network/settings.php

@@ -77 +77 @@
                         continue;
                 $value = wp_unslash( $_POST[$option_name] );
-                update_network_option( $option_name, $value );
+                update_site_option( $option_name, $value );
         }
 
@@ -114 +114 @@
                                 <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_network_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_site_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.' ); ?>
@@ -126 +126 @@
                                 <th scope="row"><?php _e( 'Allow new registrations' ) ?></th>
                                 <?php
-                                if ( !get_network_option( 'registration' ) )
-                                        update_network_option( 'registration', 'none' );
-                                $reg = get_network_option( 'registration' );
+                                if ( !get_site_option( 'registration' ) )
+                                        update_site_option( 'registration', 'none' );
+                                $reg = get_site_option( 'registration' );
                                 ?>
                                 <td>
@@ -147 +147 @@
                                 <th scope="row"><?php _e( 'Registration notification' ) ?></th>
                                 <?php
-                                if ( !get_network_option( 'registrationnotification' ) )
-                                        update_network_option( 'registrationnotification', 'yes' );
+                                if ( !get_site_option( 'registrationnotification' ) )
+                                        update_site_option( 'registrationnotification', 'yes' );
                                 ?>
                                 <td>
-                                        <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>
+                                        <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>
                                 </td>
                         </tr>
@@ -158 +158 @@
                                 <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_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>
+                                        <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>
                                 </td>
                         </tr>
@@ -165 +165 @@
                                 <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_network_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_site_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.' ) ?>
@@ -175 +175 @@
                                 <th scope="row"><label for="limited_email_domains"><?php _e( 'Limited Email Registrations' ) ?></label></th>
                                 <td>
-                                        <?php $limited_email_domains = get_network_option( 'limited_email_domains' );
+                                        <?php $limited_email_domains = get_site_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">
@@ -189 +189 @@
                                 <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_network_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_network_option( 'banned_email_domains' ) ) ); ?></textarea>
+<?php echo esc_textarea( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_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.' ) ?>
@@ -204 +204 @@
                                 <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_network_option( 'welcome_email' ) ) ?></textarea>
+<?php echo esc_textarea( get_site_option( 'welcome_email' ) ) ?></textarea>
                                         <p class="description" id="welcome-email-desc">
                                                 <?php _e( 'The welcome email sent to new site owners.' ) ?>
@@ -214 +214 @@
                                 <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_network_option( 'welcome_user_email' ) ) ?></textarea>
+<?php echo esc_textarea( get_site_option( 'welcome_user_email' ) ) ?></textarea>
                                         <p class="description" id="welcome-user-email-desc">
                                                 <?php _e( 'The welcome email sent to new users.' ) ?>
@@ -224 +224 @@
                                 <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_network_option( 'first_post' ) ) ?></textarea>
+<?php echo esc_textarea( get_site_option( 'first_post' ) ) ?></textarea>
                                         <p class="description" id="first-post-desc">
                                                 <?php _e( 'The first post on a new site.' ) ?>
@@ -234 +234 @@
                                 <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_network_option( 'first_page' ) ) ?></textarea>
+<?php echo esc_textarea( get_site_option( 'first_page' ) ) ?></textarea>
                                         <p class="description" id="first-page-desc">
                                                 <?php _e( 'The first page on a new site.' ) ?>
@@ -244 +244 @@
                                 <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_network_option( 'first_comment' ) ) ?></textarea>
+<?php echo esc_textarea( get_site_option( 'first_comment' ) ) ?></textarea>
                                         <p class="description" id="first-comment-desc">
                                                 <?php _e( 'The first comment on a new site.' ) ?>
@@ -253 +253 @@
                                 <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_network_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_site_option('first_comment_author') ?>" />
                                         <p class="description" id="first-comment-author-desc">
                                                 <?php _e( 'The author of the first comment on a new site.' ) ?>
@@ -262 +262 @@
                                 <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_network_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_site_option( 'first_comment_url' ) ) ?>" />
                                         <p class="description" id="first-comment-url-desc">
                                                 <?php _e( 'The URL for the first comment on a new site.' ) ?>
@@ -274 +274 @@
                                 <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_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 />
+                                        <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 />
                                         <p class="screen-reader-text" id="blog-upload-space-desc">
                                                 <?php _e( 'Size in megabytes' ) ?>
@@ -284 +284 @@
                                 <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_network_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_site_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.' ) ?>
@@ -294 +294 @@
                                 <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_network_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_site_option( 'fileupload_maxk', 300 ) ) . '" />' ); ?>
                                         <p class="screen-reader-text" id="fileupload-maxk-desc">
                                                 <?php _e( 'Size in kilobytes' ) ?>
@@ -313 +313 @@
                                         <td>
                                                 <?php
-                                                $lang = get_network_option( 'WPLANG' );
+                                                $lang = get_site_option( 'WPLANG' );
                                                 if ( ! in_array( $lang, $languages ) ) {
                                                         $lang = '';
@@ -340 +340 @@
                                 <td>
                         <?php
-                        $menu_perms = get_network_option( 'menu_items' );
+                        $menu_perms = get_site_option( 'menu_items' );
                         /**
                          * Filter available network-wide administration menu options.

trunk/src/wp-admin/network/site-new.php

@@ -125 +125 @@
                         wp_unslash( $title )
                 );
-                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' ) . '>' );
+                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' ) . '>' );
                 wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
                 wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) );
@@ -190 +190 @@
                                         <?php
                                         // Network default.
-                                        $lang = get_network_option( 'WPLANG' );
+                                        $lang = get_site_option( 'WPLANG' );
 
                                         // Use English if the default isn't available.

trunk/src/wp-admin/network/themes.php

@@ -30 +30 @@
 
 if ( $action ) {
-        $allowed_themes = get_network_option( 'allowedthemes' );
+        $allowed_themes = get_site_option( 'allowedthemes' );
         switch ( $action ) {
                 case 'enable':
                         check_admin_referer('enable-theme_' . $_GET['theme']);
                         $allowed_themes[ $_GET['theme'] ] = true;
-                        update_network_option( 'allowedthemes', $allowed_themes );
+                        update_site_option( 'allowedthemes', $allowed_themes );
                         if ( false === strpos( $referer, '/network/themes.php' ) )
                                 wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
@@ -44 +44 @@
                         check_admin_referer('disable-theme_' . $_GET['theme']);
                         unset( $allowed_themes[ $_GET['theme'] ] );
-                        update_network_option( 'allowedthemes', $allowed_themes );
+                        update_site_option( 'allowedthemes', $allowed_themes );
                         wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
                         exit;
@@ -56 +56 @@
                         foreach ( (array) $themes as $theme )
                                 $allowed_themes[ $theme ] = true;
-                        update_network_option( 'allowedthemes', $allowed_themes );
+                        update_site_option( 'allowedthemes', $allowed_themes );
                         wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
                         exit;
@@ -68 +68 @@
                         foreach ( (array) $themes as $theme )
                                 unset( $allowed_themes[ $theme ] );
-                        update_network_option( 'allowedthemes', $allowed_themes );
+                        update_site_option( 'allowedthemes', $allowed_themes );
                         wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
                         exit;

trunk/src/wp-admin/network/upgrade.php

@@ -53 +53 @@
                          */
                         global $wp_db_version;
-                        update_network_option( 'wpmu_upgrade_site', $wp_db_version );
+                        update_site_option( 'wpmu_upgrade_site', $wp_db_version );
                 }
 
@@ -110 +110 @@
         case 'show':
         default:
-                if ( get_network_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
+                if ( get_site_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
                 ?>
                 <h2><?php _e( 'Database Upgrade Required' ); ?></h2>

trunk/src/wp-admin/options-writing.php

@@ -57 +57 @@
 
 <table class="form-table">
-<?php if ( get_network_option( 'initial_db_version' ) < 32453 ) : ?>
+<?php if ( get_site_option( 'initial_db_version' ) < 32453 ) : ?>
 <tr>
 <th scope="row"><?php _e('Formatting') ?></th>

trunk/src/wp-admin/options.php

@@ -96 +96 @@
         $whitelist_options['reading'][] = 'blog_charset';
 
-if ( get_network_option( 'initial_db_version' ) < 32453 ) {
+if ( get_site_option( 'initial_db_version' ) < 32453 ) {
         $whitelist_options['writing'][] = 'use_smilies';
         $whitelist_options['writing'][] = 'use_balanceTags';

trunk/src/wp-admin/plugin-editor.php

@@ -75 +75 @@
                                 update_option( 'recently_activated', array( $file => time() ) + (array) get_option( 'recently_activated' ) );
                         } else {
-                                update_network_option( 'recently_activated', array( $file => time() ) + (array) get_network_option( 'recently_activated' ) );
+                                update_site_option( 'recently_activated', array( $file => time() ) + (array) get_site_option( 'recently_activated' ) );
                         }
 

trunk/src/wp-admin/plugins.php

@@ -56 +56 @@
                                 update_option( 'recently_activated', $recent );
                         } else {
-                                $recent = (array) get_network_option( 'recently_activated' );
+                                $recent = (array) get_site_option( 'recently_activated' );
                                 unset( $recent[ $plugin ] );
-                                update_network_option( 'recently_activated', $recent );
+                                update_site_option( 'recently_activated', $recent );
                         }
 
@@ -102 +102 @@
                                 $recent = (array) get_option('recently_activated' );
                         } else {
-                                $recent = (array) get_network_option( 'recently_activated' );
+                                $recent = (array) get_site_option('recently_activated' );
                         }
 
@@ -112 +112 @@
                                 update_option( 'recently_activated', $recent );
                         } else {
-                                update_network_option( 'recently_activated', $recent );
+                                update_site_option( 'recently_activated', $recent );
                         }
 
@@ -183 +183 @@
                                 update_option( 'recently_activated', array( $plugin => time() ) + (array) get_option( 'recently_activated' ) );
                         } else {
-                                update_network_option( 'recently_activated', array( $plugin => time() ) + (array) get_network_option( 'recently_activated' ) );
+                                update_site_option( 'recently_activated', array( $plugin => time() ) + (array) get_site_option( 'recently_activated' ) );
                         }
 
@@ -221 +221 @@
                                 update_option( 'recently_activated', $deactivated + (array) get_option( 'recently_activated' ) );
                         } else {
-                                update_network_option( 'recently_activated', $deactivated + (array) get_network_option( 'recently_activated' ) );
+                                update_site_option( 'recently_activated', $deactivated + (array) get_site_option( 'recently_activated' ) );
                         }
 
@@ -383 +383 @@
                                 update_option( 'recently_activated', array() );
                         } else {
-                                update_network_option( 'recently_activated', array() );
+                                update_site_option( 'recently_activated', array() );
                         }
                         break;

trunk/src/wp-admin/user-edit.php

@@ -317 +317 @@
 <tr class="user-super-admin-wrap"><th><?php _e('Super Admin'); ?></th>
 <td>
-<?php if ( $profileuser->user_email != get_network_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
+<?php if ( $profileuser->user_email != get_site_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 : ?>

trunk/src/wp-includes/capabilities-functions.php

@@ -337 +337 @@
                 if ( is_multisite() ) {
                         // update_, install_, and delete_ are handled above with is_super_admin().
-                        $menu_perms = get_network_option( 'menu_items', array() );
+                        $menu_perms = get_site_option( 'menu_items', array() );
                         if ( empty( $menu_perms['plugins'] ) )
                                 $caps[] = 'manage_network_plugins';
@@ -353 +353 @@
                 if ( !is_multisite() )
                         $caps[] = $cap;
-                elseif ( is_super_admin( $user_id ) || get_network_option( 'add_new_users' ) )
+                elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
                         $caps[] = $cap;
                 else
@@ -579 +579 @@
                 return $super_admins;
         else
-                return get_network_option( 'site_admins', array('admin') );
+                return get_site_option( 'site_admins', array('admin') );
 }
 

trunk/src/wp-includes/class-wp-theme.php

@@ -1192 +1192 @@
                 static $allowed_themes;
                 if ( ! isset( $allowed_themes ) )
-                        $allowed_themes = (array) get_network_option( 'allowedthemes' );
+                        $allowed_themes = (array) get_site_option( 'allowedthemes' );
                 return $allowed_themes;
         }

trunk/src/wp-includes/default-constants.php

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

trunk/src/wp-includes/functions.php

@@ -1761 +1761 @@
          * We also sometimes obey UPLOADS when rewriting is enabled -- see the next block.
          */
-        if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_network_option( 'ms_files_rewriting' ) ) ) {
+        if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) ) {
                 $dir = ABSPATH . UPLOADS;
                 $url = trailingslashit( $siteurl ) . UPLOADS;
@@ -1769 +1769 @@
         if ( is_multisite() && ! ( is_main_network() && is_main_site() && defined( 'MULTISITE' ) ) ) {
 
-                if ( ! get_network_option( 'ms_files_rewriting' ) ) {
+                if ( ! get_site_option( 'ms_files_rewriting' ) ) {
                         /*
                          * If ms-files rewriting is disabled (networks created post-3.5), it is fairly
@@ -4004 +4004 @@
                         $global_terms = (bool) $filter;
                 else
-                        $global_terms = (bool) get_network_option( 'global_terms_enabled', false );
+                        $global_terms = (bool) get_site_option( 'global_terms_enabled', false );
         }
         return $global_terms;

trunk/src/wp-includes/l10n.php

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

trunk/src/wp-includes/ms-default-constants.php

@@ -24 +24 @@
         add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
 
-        if ( ! get_network_option( 'ms_files_rewriting' ) )
+        if ( ! get_site_option( 'ms_files_rewriting' ) )
                 return;
 

trunk/src/wp-includes/ms-deprecated.php

@@ -26 +26 @@
 function get_dashboard_blog() {
     _deprecated_function( __FUNCTION__, '3.1' );
-    if ( $blog = get_network_option( 'dashboard_blog' ) )
+    if ( $blog = get_site_option( 'dashboard_blog' ) )
         return get_blog_details( $blog );
 

trunk/src/wp-includes/ms-functions.php

@@ -101 +101 @@
  */
 function get_user_count() {
-        return get_network_option( 'user_count' );
+        return get_site_option( 'user_count' );
 }
 
@@ -118 +118 @@
                 _deprecated_argument( __FUNCTION__, '3.1' );
 
-        return get_network_option( 'blog_count' );
+        return get_site_option( 'blog_count' );
 }
 
@@ -345 +345 @@
  */
 function is_email_address_unsafe( $user_email ) {
-        $banned_names = get_network_option( 'banned_email_domains' );
+        $banned_names = get_site_option( 'banned_email_domains' );
         if ( $banned_names && ! is_array( $banned_names ) )
                 $banned_names = explode( "\n", $banned_names );
@@ -423 +423 @@
                 $errors->add('user_name', __( 'Please enter a username.' ) );
 
-        $illegal_names = get_network_option( 'illegal_names' );
+        $illegal_names = get_site_option( 'illegal_names' );
         if ( ! is_array( $illegal_names ) ) {
                 $illegal_names = array(  'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
-                add_network_option( 'illegal_names', $illegal_names );
+                add_site_option( 'illegal_names', $illegal_names );
         }
         if ( in_array( $user_name, $illegal_names ) )
@@ -451 +451 @@
                 $errors->add('user_email', __( 'Please enter a valid email address.' ) );
 
-        $limited_email_domains = get_network_option( 'limited_email_domains' );
+        $limited_email_domains = get_site_option( 'limited_email_domains' );
         if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
                 $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
@@ -545 +545 @@
 
         $errors = new WP_Error();
-        $illegal_names = get_network_option( 'illegal_names' );
+        $illegal_names = get_site_option( 'illegal_names' );
         if ( $illegal_names == false ) {
                 $illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
-                add_network_option( 'illegal_names', $illegal_names );
+                add_site_option( 'illegal_names', $illegal_names );
         }
 
@@ -790 +790 @@
 
         $activate_url = esc_url($activate_url);
-        $admin_email = get_network_option( 'admin_email' );
+        $admin_email = get_site_option( 'admin_email' );
         if ( $admin_email == '' )
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-        $from_name = get_network_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_network_option( 'site_name' ) );
+        $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
         $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = sprintf(
@@ -883 +883 @@
 
         // Send email with activation link.
-        $admin_email = get_network_option( 'admin_email' );
+        $admin_email = get_site_option( 'admin_email' );
         if ( $admin_email == '' )
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-        $from_name = get_network_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_network_option( 'site_name' ) );
+        $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
         $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = sprintf(
@@ -1125 +1125 @@
         }
 
-        add_option( 'WPLANG', get_network_option( 'WPLANG' ) );
+        add_option( 'WPLANG', get_site_option( 'WPLANG' ) );
         update_option( 'blog_public', (int) $meta['public'] );
 
@@ -1161 +1161 @@
  */
 function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
-        if ( get_network_option( 'registrationnotification' ) != 'yes' )
+        if ( get_site_option( 'registrationnotification' ) != 'yes' )
                 return false;
 
-        $email = get_network_option( 'admin_email' );
+        $email = get_site_option( 'admin_email' );
         if ( is_email($email) == false )
                 return false;
@@ -1206 +1206 @@
  */
 function newuser_notify_siteadmin( $user_id ) {
-        if ( get_network_option( 'registrationnotification' ) != 'yes' )
+        if ( get_site_option( 'registrationnotification' ) != 'yes' )
                 return false;
 
-        $email = get_network_option( 'admin_email' );
+        $email = get_site_option( 'admin_email' );
 
         if ( is_email($email) == false )
@@ -1345 +1345 @@
         update_option( 'home', $url );
 
-        if ( get_network_option( 'ms_files_rewriting' ) )
+        if ( get_site_option( 'ms_files_rewriting' ) )
                 update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
         else
@@ -1421 +1421 @@
                 return false;
 
-        $welcome_email = get_network_option( 'welcome_email' );
+        $welcome_email = get_site_option( 'welcome_email' );
         if ( $welcome_email == false ) {
                 /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
@@ -1464 +1464 @@
          */
         $welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
-        $admin_email = get_network_option( 'admin_email' );
+        $admin_email = get_site_option( 'admin_email' );
 
         if ( $admin_email == '' )
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-        $from_name = get_network_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_network_option( 'site_name' ) );
+        $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
         $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = $welcome_email;
@@ -1520 +1520 @@
                 return false;
 
-        $welcome_email = get_network_option( 'welcome_user_email' );
+        $welcome_email = get_site_option( 'welcome_user_email' );
 
         $user = get_userdata( $user_id );
@@ -1542 +1542 @@
         $welcome_email = str_replace( 'LOGINLINK', wp_login_url(), $welcome_email );
 
-        $admin_email = get_network_option( 'admin_email' );
+        $admin_email = get_site_option( 'admin_email' );
 
         if ( $admin_email == '' )
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-        $from_name = get_network_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_network_option( 'site_name' ) );
+        $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
         $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = $welcome_email;
@@ -1719 +1719 @@
  */
 function check_upload_mimes( $mimes ) {
-        $site_exts = explode( ' ', get_network_option( 'upload_filetypes', 'jpg jpeg png gif' ) );
+        $site_exts = explode( ' ', get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) );
         $site_mimes = array();
         foreach ( $site_exts as $ext ) {
@@ -1860 +1860 @@
  */
 function upload_is_file_too_big( $upload ) {
-        if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_network_option( 'upload_space_check_disabled' ) )
+        if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
                 return $upload;
 
-        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 ) );
+        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 ));
 
         return $upload;
@@ -2077 +2077 @@
  */
 function users_can_register_signup_filter() {
-        $registration = get_network_option( 'registration' );
+        $registration = get_site_option('registration');
         return ( $registration == 'all' || $registration == 'user' );
 }
@@ -2106 +2106 @@
 
 --The Team @ SITE_NAME' );
-                update_network_option( 'welcome_user_email', $text );
+                update_site_option( 'welcome_user_email', $text );
         }
         return $text;
@@ -2232 +2232 @@
 
         $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_network_option( 'blog_count', $count );
+        update_site_option( 'blog_count', $count );
 }
 
@@ -2246 +2246 @@
 
         $count = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" );
-        update_network_option( 'user_count', $count );
+        update_site_option( 'user_count', $count );
 }
 
@@ -2284 +2284 @@
 
         if ( ! is_numeric( $space_allowed ) )
-                $space_allowed = get_network_option( 'blog_upload_space' );
+                $space_allowed = get_site_option( 'blog_upload_space' );
 
         if ( empty( $space_allowed ) || ! is_numeric( $space_allowed ) )
@@ -2312 +2312 @@
         }
         $space_allowed = $allowed * 1024 * 1024;
-        if ( get_network_option( 'upload_space_check_disabled' ) )
+        if ( get_site_option( 'upload_space_check_disabled' ) )
                 return $space_allowed;
 
@@ -2330 +2330 @@
  */
 function is_upload_space_available() {
-        if ( get_network_option( 'upload_space_check_disabled' ) )
+        if ( get_site_option( 'upload_space_check_disabled' ) )
                 return true;
 
@@ -2342 +2342 @@
  */
 function upload_size_limit_filter( $size ) {
-        $fileupload_maxk = 1024 * get_network_option( 'fileupload_maxk', 1500 );
-        if ( get_network_option( 'upload_space_check_disabled' ) )
+        $fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 );
+        if ( get_site_option( 'upload_space_check_disabled' ) )
                 return min( $size, $fileupload_maxk );
 

trunk/src/wp-includes/ms-load.php

@@ -35 +35 @@
  */
 function wp_get_active_network_plugins() {
-        $active_plugins = (array) get_network_option( 'active_sitewide_plugins', array() );
+        $active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
         if ( empty( $active_plugins ) )
                 return array();
@@ -97 +97 @@
                         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_network_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_site_option( 'admin_email', 'support@' . get_current_site()->domain ) ) ) );
         }
 

trunk/src/wp-includes/option.php

@@ -89 +89 @@
                                 } else { // option does not exist, so we must cache its non-existence
                                         if ( ! is_array( $notoptions ) ) {
-                                                $notoptions = array();
+                                                 $notoptions = array();
                                         }
                                         $notoptions[$option] = true;
@@ -1481 +1481 @@
                 $option_timeout = '_site_transient_timeout_' . $transient;
                 $option = '_site_transient_' . $transient;
-                $result = delete_network_option( $option );
+                $result = delete_site_option( $option );
                 if ( $result )
-                        delete_network_option( $option_timeout );
+                        delete_site_option( $option_timeout );
         }
         if ( $result ) {
@@ -1544 +1544 @@
                 if ( ! in_array( $transient, $no_timeout ) ) {
                         $transient_timeout = '_site_transient_timeout_' . $transient;
-                        $timeout = get_network_option( $transient_timeout );
+                        $timeout = get_site_option( $transient_timeout );
                         if ( false !== $timeout && $timeout < time() ) {
-                                delete_network_option( $transient_option  );
-                                delete_network_option( $transient_timeout );
+                                delete_site_option( $transient_option  );
+                                delete_site_option( $transient_timeout );
                                 $value = false;
                         }
@@ -1553 +1553 @@
 
                 if ( ! isset( $value ) )
-                        $value = get_network_option( $transient_option );
+                        $value = get_site_option( $transient_option );
         }
 
@@ -1621 +1621 @@
                 $transient_timeout = '_site_transient_timeout_' . $transient;
                 $option = '_site_transient_' . $transient;
-                if ( false === get_network_option( $option ) ) {
+                if ( false === get_site_option( $option ) ) {
                         if ( $expiration )
-                                add_network_option( $transient_timeout, time() + $expiration );
-                        $result = add_network_option( $option, $value );
+                                add_site_option( $transient_timeout, time() + $expiration );
+                        $result = add_site_option( $option, $value );
                 } else {
                         if ( $expiration )
-                                update_network_option( $transient_timeout, time() + $expiration );
-                        $result = update_network_option( $option, $value );
+                                update_site_option( $transient_timeout, time() + $expiration );
+                        $result = update_site_option( $option, $value );
                 }
         }

trunk/src/wp-includes/pluggable.php

@@ -1962 +1962 @@
                                 $values[ $type ] = constant( $const );
                         } elseif ( ! $values[ $type ] ) {
-                                $values[ $type ] = get_network_option( "{$scheme}_{$type}" );
+                                $values[ $type ] = get_site_option( "{$scheme}_{$type}" );
                                 if ( ! $values[ $type ] ) {
                                         $values[ $type ] = wp_generate_password( 64, true, true );
-                                        update_network_option( "{$scheme}_{$type}", $values[ $type ] );
+                                        update_site_option( "{$scheme}_{$type}", $values[ $type ] );
                                 }
                         }
@@ -1971 +1971 @@
         } else {
                 if ( ! $values['key'] ) {
-                        $values['key'] = get_network_option( 'secret_key' );
+                        $values['key'] = get_site_option( 'secret_key' );
                         if ( ! $values['key'] ) {
                                 $values['key'] = wp_generate_password( 64, true, true );
-                                update_network_option( 'secret_key', $values['key'] );
+                                update_site_option( 'secret_key', $values['key'] );
                         }
                 }

trunk/src/wp-includes/script-loader.php

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

trunk/src/wp-includes/user-functions.php

@@ -1812 +1812 @@
 function wp_get_user_contact_methods( $user = null ) {
         $methods = array();
-        if ( get_network_option( 'initial_db_version' ) < 23588 ) {
+        if ( get_site_option( 'initial_db_version' ) < 23588 ) {
                 $methods = array(
                         'aim'    => __( 'AIM' ),

trunk/src/wp-signup.php

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