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-login.php
View File

@@ -98,7 +98,7 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
if ( is_multisite() ) {
$login_header_url = network_home_url();
$login_header_title = get_current_site()->site_name;
$login_header_title = get_network()->site_name;
} else {
$login_header_url = __( 'https://wordpress.org/' );
$login_header_title = __( 'Powered by WordPress' );
@@ -332,7 +332,7 @@ function retrieve_password() {
$message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n";
if ( is_multisite() ) {
$blogname = get_current_site()->site_name;
$blogname = get_network()->site_name;
} else {
/*
* The blogname option is escaped with esc_html on the way into the database