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

Timestamp:

10/07/2015 05:11:01 PM (9 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/schema.php (modified) (2 diffs)

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(),