Changeset 41242

Timestamp:

08/12/2017 01:10:24 PM (9 years ago)

Author:

flixos90

Message:

Multisite: Remove references to $wpdb->siteid and use get_current_network_id() instead.

Props sathyapulse, spacedmonkey.
Fixes #41507.

Location:

trunk

Files:

• src/wp-admin/includes/ms.php (modified) (1 diff)
• src/wp-includes/ms-blogs.php (modified) (1 diff)
• src/wp-includes/ms-deprecated.php (modified) (5 diffs)
• src/wp-includes/ms-functions.php (modified) (2 diffs)
• src/wp-includes/option.php (modified) (1 diff)
• src/wp-signup.php (modified) (2 diffs)
• tests/phpunit/tests/multisite/network.php (modified) (2 diffs)
• tests/phpunit/tests/option/multisite.php (modified) (1 diff)

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

@@ -793 +793 @@
  * @since 3.1.0
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @param int $network_id The network ID to check.
  * @return bool True if network can be edited, otherwise false.
  */
 function can_edit_network( $network_id ) {
-        global $wpdb;
-
-        if ( $network_id == $wpdb->siteid )
+        if ( $network_id == get_current_network_id() )
                 $result = true;
         else

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

@@ -1092 +1092 @@
                 _deprecated_argument( __FUNCTION__, 'MU' ); // never used
 
-        return $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", $wpdb->siteid, $start, $quantity ) , ARRAY_A );
+        return $wpdb->get_results( $wpdb->prepare( "SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", get_current_network_id(), $start, $quantity ), ARRAY_A );
 }
 

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

@@ -188 +188 @@
 
         global $wpdb;
-        $blogs = $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $wpdb->siteid), ARRAY_A );
+        $blogs = $wpdb->get_results( $wpdb->prepare( "SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", get_current_network_id() ), ARRAY_A );
 
         $blog_list = array();
@@ -431 +431 @@
 
         if ( ! $domain )
-                $network_id = $wpdb->siteid;
+                $network_id = get_current_network_id();
         else
                 $network_id = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path ) );
@@ -447 +447 @@
  * @deprecated 4.6.0 Use get_sites()
  * @see get_sites()
- *
- * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param array $args {
@@ -469 +467 @@
  */
 function wp_get_sites( $args = array() ) {
-        global $wpdb;
-
         _deprecated_function( __FUNCTION__, '4.6.0', 'get_sites()' );
 
@@ -477 +473 @@
 
         $defaults = array(
-                'network_id' => $wpdb->siteid,
+                'network_id' => get_current_network_id(),
                 'public'     => null,
                 'archived'   => null,

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

@@ -73 +73 @@
                 if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
                         foreach ( (array) $blogs as $blog_id => $blog ) {
-                                if ( $blog->site_id != $wpdb->siteid )
+                                if ( $blog->site_id != get_current_network_id() )
                                         continue;
                                 $details = get_site( $blog_id );
@@ -1090 +1090 @@
         }
 
-        $blog_id = wpmu_create_blog( $signup->domain, $signup->path, $signup->title, $user_id, $meta, $wpdb->siteid );
+        $blog_id = wpmu_create_blog( $signup->domain, $signup->path, $signup->title, $user_id, $meta, get_current_network_id() );
 
         // TODO: What to do if we create a user but cannot create a blog?

trunk/src/wp-includes/option.php

@@ -224 +224 @@
 
         if ( empty($network_id) )
-                $network_id = $wpdb->siteid;
+                $network_id = get_current_network_id();
 
         $core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting' );

trunk/src/wp-signup.php

@@ -355 +355 @@
  */
 function validate_another_blog_signup() {
-        global $wpdb, $blogname, $blog_title, $errors, $domain, $path;
+        global $blogname, $blog_title, $errors, $domain, $path;
         $current_user = wp_get_current_user();
         if ( ! is_user_logged_in() ) {
@@ -423 +423 @@
         $meta = apply_filters( 'add_signup_meta', $meta_defaults );
 
-        $blog_id = wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid );
+        $blog_id = wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, get_current_network_id() );
 
         if ( is_wp_error( $blog_id ) ) {

trunk/tests/phpunit/tests/multisite/network.php

@@ -190 +190 @@
          */
         public function test_get_blog_count_on_different_network() {
-                global $current_site, $wpdb;
-
-                // switch_to_network()...
-                $orig_network_id = $current_site->id;
-                $orig_wpdb_network_id = $wpdb->siteid;
-                $current_site->id = self::$different_network_id;
-                $wpdb->siteid = self::$different_network_id;
-                wp_update_network_site_counts();
-                $current_site->id = $orig_network_id;
-                $wpdb->siteid = $orig_wpdb_network_id;
+                wp_update_network_site_counts( self::$different_network_id );
 
                 $site_count = get_blog_count( self::$different_network_id );
@@ -210 +201 @@
          */
         public function test_get_user_count_on_different_network() {
-                global $current_site, $wpdb;
-
                 wp_update_network_user_counts();
                 $current_network_user_count = get_user_count();
 
-                // switch_to_network()...
-                $orig_network_id = $current_site->id;
-                $orig_wpdb_network_id = $wpdb->siteid;
-                $current_site->id = self::$different_network_id;
-                $wpdb->siteid = self::$different_network_id;
-
                 // Add another user to fake the network user count to be different.
                 wpmu_create_user( 'user', 'pass', 'email' );
 
-                wp_update_network_user_counts();
-
-                // restore_current_network()...
-                $current_site->id = $orig_network_id;
-                $wpdb->siteid = $orig_wpdb_network_id;
+                wp_update_network_user_counts( self::$different_network_id );
 
                 $user_count = get_user_count( self::$different_network_id );

trunk/tests/phpunit/tests/option/multisite.php

@@ -149 +149 @@
          */
         function test_site_notoptions() {
-                global $wpdb;
-                $notoptions_key = "{$wpdb->siteid}:notoptions";
+                $network_id = get_current_network_id();
+                $notoptions_key = "{$network_id}:notoptions";
 
                 $_notoptions = wp_cache_get( 'notoptions', 'site-options' );