Changeset 38457

Timestamp:

08/31/2016 04:55:01 AM (8 years ago)

Author:

wonderboymusic

Message:

Multisite: use get_current_blog_id() where applicable, in lieu of plucking the $blog_id global from outer space.

See #37699.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-themes-list-table.php (modified) (1 diff)
• wp-includes/cache.php (modified) (1 diff)
• wp-includes/class-wp-user-query.php (modified) (1 diff)
• wp-includes/deprecated.php (modified) (2 diffs)
• wp-includes/load.php (modified) (3 diffs)
• wp-includes/ms-blogs.php (modified) (7 diffs)
• wp-includes/ms-functions.php (modified) (1 diff)
• wp-includes/user.php (modified) (2 diffs)

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

@@ -92 +92 @@
         }
 
+        $blog_id = get_current_blog_id();
         if ( is_multisite() ) {
             if ( current_user_can( 'install_themes' ) && current_user_can( 'manage_network_themes' ) ) {
-                printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $GLOBALS['blog_id'] ), network_admin_url( 'theme-install.php' ) );
+                printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $blog_id ), network_admin_url( 'theme-install.php' ) );
 
                 return;
             } elseif ( current_user_can( 'manage_network_themes' ) ) {
-                printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $GLOBALS['blog_id'] ) );
+                printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $blog_id ) );
 
                 return;

trunk/src/wp-includes/cache.php

@@ -730 +730 @@
      *
      * @since 2.0.8
-     *
-     * @global int $blog_id Global blog ID.
      */
     public function __construct() {
-        global $blog_id;
-
         $this->multisite = is_multisite();
-        $this->blog_prefix =  $this->multisite ? $blog_id . ':' : '';
+        $this->blog_prefix =  $this->multisite ? get_current_blog_id() . ':' : '';
 
 

trunk/src/wp-includes/class-wp-user-query.php

@@ -105 +105 @@
     public static function fill_query_vars( $args ) {
         $defaults = array(
-            'blog_id' => $GLOBALS['blog_id'],
+            'blog_id' => get_current_blog_id(),
             'role' => '',
             'role__in' => array(),

trunk/src/wp-includes/deprecated.php

@@ -2358 +2358 @@
  *
  * @global wpdb $wpdb    WordPress database abstraction object.
- * @global int  $blog_id The site ID of the site for those that use more than one site.
  *
  * @param int $id Site ID.
@@ -2366 +2365 @@
     _deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
 
-    global $wpdb, $blog_id;
-    if ( empty($id) )
-        $id = (int) $blog_id;
+    global $wpdb;
+    if ( empty( $id ) ) {
+        $id = get_current_blog_id();
+    }
     $blog_prefix = $wpdb->get_blog_prefix($id);
     $users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" );

trunk/src/wp-includes/load.php

@@ -471 +471 @@
  * @since 3.0.0
  * @access private
- *
- * @global int $blog_id Blog ID.
  */
 function wp_start_object_cache() {
-    global $blog_id;
-
     $first_init = false;
     if ( ! function_exists( 'wp_cache_init' ) ) {
         if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
             require_once ( WP_CONTENT_DIR . '/object-cache.php' );
-            if ( function_exists( 'wp_cache_init' ) )
+            if ( function_exists( 'wp_cache_init' ) ) {
                 wp_using_ext_object_cache( true );
+            }
         }
 
@@ -496 +493 @@
     }
 
-    if ( ! wp_using_ext_object_cache() )
+    if ( ! wp_using_ext_object_cache() ) {
         require_once ( ABSPATH . WPINC . '/cache.php' );
+    }
 
     /*
@@ -504 +502 @@
      * have changed and it may need to update keys and cleanup caches.
      */
-    if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) )
-        wp_cache_switch_to_blog( $blog_id );
-    elseif ( function_exists( 'wp_cache_init' ) )
+    if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) ) {
+        wp_cache_switch_to_blog( get_current_blog_id() );
+    } elseif ( function_exists( 'wp_cache_init' ) ) {
         wp_cache_init();
+    }
 
     if ( function_exists( 'wp_cache_add_global_groups' ) ) {

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

@@ -767 +767 @@
     global $wpdb;
 
-    if ( empty( $new_blog ) )
-        $new_blog = $GLOBALS['blog_id'];
-
-    $GLOBALS['_wp_switched_stack'][] = $GLOBALS['blog_id'];
+    $blog_id = get_current_blog_id();
+    if ( empty( $new_blog ) ) {
+        $new_blog = $blog_id;
+    }
+
+    $GLOBALS['_wp_switched_stack'][] = $blog_id;
 
     /*
@@ -777 +779 @@
      * the extra unnecessary work
      */
-    if ( $new_blog == $GLOBALS['blog_id'] ) {
+    if ( $new_blog == $blog_id ) {
         /**
          * Fires when the blog is switched.
@@ -793 +795 @@
     $wpdb->set_blog_id( $new_blog );
     $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
-    $prev_blog_id = $GLOBALS['blog_id'];
+    $prev_blog_id = $blog_id;
     $GLOBALS['blog_id'] = $new_blog;
 
@@ -801 +803 @@
         global $wp_object_cache;
 
-        if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
+        if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
             $global_groups = $wp_object_cache->global_groups;
-        else
+        } else {
             $global_groups = false;
-
+        }
         wp_cache_init();
 
@@ -849 +851 @@
     global $wpdb;
 
-    if ( empty( $GLOBALS['_wp_switched_stack'] ) )
+    if ( empty( $GLOBALS['_wp_switched_stack'] ) ) {
         return false;
+    }
 
     $blog = array_pop( $GLOBALS['_wp_switched_stack'] );
-
-    if ( $GLOBALS['blog_id'] == $blog ) {
+    $blog_id = get_current_blog_id();
+
+    if ( $blog_id == $blog ) {
         /** This filter is documented in wp-includes/ms-blogs.php */
         do_action( 'switch_blog', $blog, $blog );
@@ -863 +867 @@
 
     $wpdb->set_blog_id( $blog );
-    $prev_blog_id = $GLOBALS['blog_id'];
+    $prev_blog_id = $blog_id;
     $GLOBALS['blog_id'] = $blog;
     $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
@@ -872 +876 @@
         global $wp_object_cache;
 
-        if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) )
+        if ( is_object( $wp_object_cache ) && isset( $wp_object_cache->global_groups ) ) {
             $global_groups = $wp_object_cache->global_groups;
-        else
+        } else {
             $global_groups = false;
+        }
 
         wp_cache_init();

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

@@ -1967 +1967 @@
  * @since MU
  *
- * @global int $blog_id
- *
  * @param array $details
  * @return true|WP_Error|void
  */
 function add_existing_user_to_blog( $details = false ) {
-    global $blog_id;
-
     if ( is_array( $details ) ) {
+        $blog_id = get_current_blog_id();
         $result = add_user_to_blog( $blog_id, $details[ 'user_id' ], $details[ 'role' ] );
         /**

trunk/src/wp-includes/user.php

@@ -965 +965 @@
  * @since 2.3.0
  * @since 4.5.0 Added the 'display_name_with_login' value for 'show'.
- *
- * @global int  $blog_id
  *
  * @param array|string $args {
@@ -1017 +1015 @@
         'show' => 'display_name', 'echo' => 1,
         'selected' => 0, 'name' => 'user', 'class' => '', 'id' => '',
-        'blog_id' => $GLOBALS['blog_id'], 'who' => '', 'include_selected' => false,
+        'blog_id' => get_current_blog_id(), 'who' => '', 'include_selected' => false,
         'option_none_value' => -1
     );