From 2078dda129b3a1214eca54352aa00ae049b16191 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Wed, 31 Aug 2016 05:03:37 +0000 Subject: [PATCH] Multisite: use `get_current_site()` instead of `$GLOBALS['current_site']` (stop yelling!) in a few remaining spots. See #37699. git-svn-id: https://develop.svn.wordpress.org/trunk@38458 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/ms-deprecated.php | 2 +- src/wp-login.php | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/ms-deprecated.php b/src/wp-includes/ms-deprecated.php index 7e43fccd83..686efccc59 100644 --- 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 index 1764d46f0c..e80be00efd 100644 --- 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 );