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

staylor · staylor · commit 2078dda129b3 · 2016-08-31T05:03:37.000Z
See #37699. git-svn-id: https://develop.svn.wordpress.org/trunk@38458 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-includes/ms-deprecated.php b/src/wp-includes/ms-deprecated.php
@@ -28,7 +28,7 @@ function get_dashboard_blog() {
     if ( $blog = get_site_option( 'dashboard_blog' ) )
         return get_blog_details( $blog );
 
-    return get_blog_details( $GLOBALS['current_site']->blog_id );
+    return get_blog_details( get_current_site()->blog_id );
 }
 
 /**
diff --git a/src/wp-login.php b/src/wp-login.php
@@ -336,14 +336,15 @@ function retrieve_password() {
 	$message .= __('To reset your password, visit the following address:') . "\r\n\r\n";
 	$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
 		 * in sanitize_option we want to reverse this for the plain text arena of emails.
 		 */
 		$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+	}
 
 	$title = sprintf( __('[%s] Password Reset'), $blogname );
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ function get_dashboard_blog() {`
`28`	`28`	`if ( $blog = get_site_option( 'dashboard_blog' ) )`
`29`	`29`	`return get_blog_details( $blog );`
`30`	`30`
`31`		`- return get_blog_details( $GLOBALS['current_site']->blog_id );`
	`31`	`+ return get_blog_details( get_current_site()->blog_id );`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`/**`