From c7a96bbf29bc1949cc21d340ab9078fd9ec1c31f Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 16 Nov 2013 13:46:10 +0000 Subject: [PATCH] Use get_current_site() instead of the $current_site global in wp-admin/admin-header.php and is_main_network(). fixes #25158. Built from https://develop.svn.wordpress.org/trunk@26235 git-svn-id: http://core.svn.wordpress.org/trunk@26142 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-header.php | 6 +++--- wp-includes/functions.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index ea446cabf9..6b6dd79f20 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -12,7 +12,7 @@ if ( ! defined( 'WP_ADMIN' ) ) // In case admin-header.php is included in a function. global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version, - $current_site, $update_title, $total_update_count, $parent_file; + $update_title, $total_update_count, $parent_file; // Catch plugins that include admin-header.php before admin.php completes. if ( empty( $current_screen ) ) @@ -22,9 +22,9 @@ get_admin_page_title(); $title = esc_html( strip_tags( $title ) ); if ( is_network_admin() ) - $admin_title = sprintf( __('Network Admin: %s'), esc_html( $current_site->site_name ) ); + $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) ); elseif ( is_user_admin() ) - $admin_title = sprintf( __('Global Dashboard: %s'), esc_html( $current_site->site_name ) ); + $admin_title = sprintf( __( 'Global Dashboard: %s' ), esc_html( get_current_site()->site_name ) ); else $admin_title = get_bloginfo( 'name' ); diff --git a/wp-includes/functions.php b/wp-includes/functions.php index aaecdd6bc0..12b1b603b2 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -3345,12 +3345,12 @@ function is_main_site( $site_id = null ) { * @return bool True if $network_id is the main network, or if not running multisite. */ function is_main_network( $network_id = null ) { - global $current_site, $wpdb; + global $wpdb; if ( ! is_multisite() ) return true; - $current_network_id = (int) $current_site->id; + $current_network_id = (int) get_current_site()->id; if ( ! $network_id ) $network_id = $current_network_id;