Ticket #25030: 25030.2.diff

src/wp-includes/functions.php

@@ -1550 +1550 @@
         }
 
         // If multisite (and if not the main site in a post-MU network)
-        if ( is_multisite() && ! ( is_main_site() && defined( 'MULTISITE' ) ) ) {
+        if ( is_multisite() && ! ( is_main_network() && is_main_site() && defined( 'MULTISITE' ) ) ) {
 
                 if ( ! get_site_option( 'ms_files_rewriting' ) ) {
                         // If ms-files rewriting is disabled (networks created post-3.5), it is fairly straightforward:
@@ -3264 +3264 @@
 }
 
 /**
+ * Checks either current site or a supplied site ID against the defined main site ID
+ * to determine if this is the main network.
+ *
+ * @since 3.7.0
+ * @package WordPress
+ *
+ * @param string $site_id optional site id to test (default current site)
+ *
+ * @return bool True if not multisite or if $site_id is the main network
+ */
+function is_main_network( $site_id = '' ) {
+        global $current_site, $wpdb;
+
+        // What are the repercussions of returning true to a network function when there is no network?
+        if ( ! is_multisite() )
+                return true;
+
+        if ( ! $site_id )
+                $site_id = $current_site->id;
+
+        if ( defined( 'PRIMARY_NETWORK_ID' ) && $site_id == PRIMARY_NETWORK_ID )
+                return true;
+
+        // What if the current site is 1 and PRIMARY_NETWORK_ID is not
+        if ( 1 == $current_site->id && $site_id == $current_site->id )
+                return true;
+
+        // This query should be cached
+        if ( $site_id == $wpdb->get_var( "SELECT id FROM $wpdb->site ORDER BY id LIMIT 1" ) )
+                return true;
+
+        return false;
+}
+
+/**
  * Whether global terms are enabled.
  *
  *