vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 12:20:22 +00:00
Code Issues Actions 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().

Browse Source 
fixes #25158.

git-svn-id: https://develop.svn.wordpress.org/trunk@26235 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2013-11-16 13:45:28 +00:00
parent 796a9a5613
commit 2e52eeb484
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-includes/functions.php
+2 -2
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.
*/
function is_main_network( $network_id = null ) {
global $current_site, $wpdb;
global $wpdb;
if ( ! is_multisite() )
return true;
$current_network_id = (int) $current_site->id;
$current_network_id = (int) get_current_site()->id;
if ( ! $network_id )
$network_id = $current_network_id;