Changeset 26120 for trunk/src/wp-includes/admin-bar.php

Timestamp:

11/13/2013 03:22:48 AM (12 years ago)

Author:

SergeyBiryukov

Message:

Use get_current_site() instead of the $current_site global when possible.

props jeremyfelt.
fixes #25158.

File:

• trunk/src/wp-includes/admin-bar.php (modified) (2 diffs)

trunk/src/wp-includes/admin-bar.php

@@ -244 +244 @@
  */
 function wp_admin_bar_site_menu( $wp_admin_bar ) {
-    global $current_site;
-
     // Don't show for logged out users.
     if ( ! is_user_logged_in() )
@@ -260 +258 @@
 
     if ( is_network_admin() ) {
-        $blogname = sprintf( __('Network Admin: %s'), esc_html( $current_site->site_name ) );
+        $blogname = sprintf( __('Network Admin: %s'), esc_html( get_current_site()->site_name ) );
     } elseif ( is_user_admin() ) {
-        $blogname = sprintf( __('Global Dashboard: %s'), esc_html( $current_site->site_name ) );
+        $blogname = sprintf( __('Global Dashboard: %s'), esc_html( get_current_site()->site_name ) );
     }