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

Timestamp:

10/19/2016 04:46:14 AM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Use get_network() and get_current_network_id() for current network data.

get_network() falls back to the current network when called without any arguments. Between this and get_current_network_id(), we can replace almost all instances of the global $current_site and all instances of get_current_site().

This effectively deprecates get_current_site(), something that we'll do in a future ticket.

Props flixos90.
Fixes #37414.

File:

• trunk/src/wp-includes/admin-bar.php (modified) (1 diff)

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

@@ -313 +313 @@
     if ( is_network_admin() ) {
         /* translators: %s: site name */
-        $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
+        $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
     } elseif ( is_user_admin() ) {
         /* translators: %s: site name */
-        $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
+        $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
     }