Ticket #42251: 42251.diff

src/wp-admin/includes/schema.php

@@ -955 +955 @@
                 $wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path, 'id' => $network_id ) );
         }
 
+        if ( function_exists( 'clean_network_cache' ) ) {
+                clean_network_cache( $network_id );
+        } else {
+                wp_cache_delete( $network_id, 'networks' );
+        }
+
         wp_cache_delete( 'networks_have_paths', 'site-options' );
 
         if ( !is_multisite() ) {

src/wp-includes/class-wp-network.php

@@ -101 +101 @@
 
                 $_network = wp_cache_get( $network_id, 'networks' );
 
-                if ( ! $_network ) {
+                if ( false === $_network ) {
                         $_network = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->site} WHERE id = %d LIMIT 1", $network_id ) );
 
                         if ( empty( $_network ) || is_wp_error( $_network ) ) {
-                                return false;
+                                $_network = -1;
                         }
 
                         wp_cache_add( $network_id, $_network, 'networks' );
                 }
 
+                if ( is_numeric( $_network ) ) {
+                        return false;
+                }
+
                 return new WP_Network( $_network );
         }
 

src/wp-includes/class-wp-site.php

@@ -163 +163 @@
 
                 $_site = wp_cache_get( $site_id, 'sites' );
 
-                if ( ! $_site ) {
+                if ( false === $_site ) {
                         $_site = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->blogs} WHERE blog_id = %d LIMIT 1", $site_id ) );
 
                         if ( empty( $_site ) || is_wp_error( $_site ) ) {
-                                return false;
+                                $_site = -1;
                         }
 
                         wp_cache_add( $site_id, $_site, 'sites' );
                 }
 
+                if ( is_numeric( $_site ) ) {
+                        return false;
+                }
+
                 return new WP_Site( $_site );
         }