WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2013-11-16 13:46:10 +00:00
parent 8a250619ce
commit c7a96bbf29
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/admin-header.php
View File

@ -12,7 +12,7 @@ if ( ! defined( 'WP_ADMIN' ) )
// In case admin-header.php is included in a function. // In case admin-header.php is included in a function.
global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version, 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. // Catch plugins that include admin-header.php before admin.php completes.
if ( empty( $current_screen ) ) if ( empty( $current_screen ) )
@ -22,9 +22,9 @@ get_admin_page_title();
$title = esc_html( strip_tags( $title ) ); $title = esc_html( strip_tags( $title ) );
if ( is_network_admin() ) 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() ) 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 else
$admin_title = get_bloginfo( 'name' ); $admin_title = get_bloginfo( 'name' );

4
wp-includes/functions.php
View File

@ -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. * @return bool True if $network_id is the main network, or if not running multisite.
*/ */
function is_main_network( $network_id = null ) { function is_main_network( $network_id = null ) {
global $current_site, $wpdb; global $wpdb;
if ( ! is_multisite() ) if ( ! is_multisite() )
return true; return true;
$current_network_id = (int) $current_site->id; $current_network_id = (int) get_current_site()->id;
if ( ! $network_id ) if ( ! $network_id )
$network_id = $current_network_id; $network_id = $current_network_id;