Changeset 38458

Timestamp:

08/31/2016 05:03:37 AM (9 years ago)

Author:

wonderboymusic

Message:

Multisite: use get_current_site() instead of $GLOBALS['current_site'] (stop yelling!) in a few remaining spots.

See #37699.

Location:

trunk/src

Files:

• wp-includes/ms-deprecated.php (modified) (1 diff)
• wp-login.php (modified) (2 diffs)

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

@@ -29 +29 @@
         return get_blog_details( $blog );
 
-    return get_blog_details( $GLOBALS['current_site']->blog_id );
+    return get_blog_details( get_current_site()->blog_id );
 }
 

trunk/src/wp-login.php

@@ -337 +337 @@
     $message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n";
 
-    if ( is_multisite() )
-        $blogname = $GLOBALS['current_site']->site_name;
-    else
+    if ( is_multisite() ) {
+        $blogname = get_current_site()->site_name;
+    } else {
         /*
          * The blogname option is escaped with esc_html on the way into the database
@@ -345 +345 @@
          */
         $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+    }
 
     $title = sprintf( __('[%s] Password Reset'), $blogname );