HostForge-Systems/wordpress
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
`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.

Built from https://develop.svn.wordpress.org/trunk@38814


git-svn-id: http://core.svn.wordpress.org/trunk@38757 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt
2016-10-19 04:47:30 +00:00
parent 1c3b96537f
commit 1560fbcbc5
26 changed files with 102 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,9 +33,9 @@ get_admin_page_title();
$title = esc_html( strip_tags( $title ) );
if ( is_network_admin() )
$admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
$admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
elseif ( is_user_admin() )
$admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
$admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
else
$admin_title = get_bloginfo( 'name' );