Changeset 34912 for trunk/src/wp-admin/includes/upgrade.php

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.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (11 diffs)

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 );
                 }
         }