Changeset 38457 for trunk/src/wp-includes/ms-functions.php

Timestamp:

08/31/2016 04:55:01 AM (3 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.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (1 diff)

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' ] );
         /**