Ticket #25158: 25158.5.diff

src/wp-admin/admin-header.php

@@ -12 +12 @@
 
 // In case admin-header.php is included in a function.
 global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version,
-        $current_site, $update_title, $total_update_count, $parent_file;
+        $update_title, $total_update_count, $parent_file;
 
+if ( is_multisite() )
+        $current_site = get_current_site();
+
 // Catch plugins that include admin-header.php before admin.php completes.
 if ( empty( $current_screen ) )
         set_current_screen();

src/wp-includes/functions.php

@@ -3343 +3343 @@
  * @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;