Changeset 45910 for trunk/src/wp-includes/class-wp-network.php

Timestamp:

08/29/2019 12:41:45 PM (5 years ago)

Author:

flixos90

Message:

Multisite: Improve performance by caching not found lookups for sites and networks.

With this change, the result of a site or network lookup by ID will be cached even if the ID does not exist. When a new site or network is created, the cache for the respective new ID is cleared.

Props mnelson4, nielsdeblaauw.
Fixes #42251.

File:

• trunk/src/wp-includes/class-wp-network.php (modified) (3 diffs)

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

@@ -102 +102 @@
         $_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;
         }
 
@@ -232 +236 @@
         }
 
-        if ( ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) && $this->domain === DOMAIN_CURRENT_SITE && $this->path === PATH_CURRENT_SITE )
-            || ( defined( 'SITE_ID_CURRENT_SITE' ) && $this->id == SITE_ID_CURRENT_SITE ) ) {
+        if ( ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) && DOMAIN_CURRENT_SITE === $this->domain && PATH_CURRENT_SITE === $this->path )
+            || ( defined( 'SITE_ID_CURRENT_SITE' ) && SITE_ID_CURRENT_SITE == $this->id ) ) {
             if ( defined( 'BLOG_ID_CURRENT_SITE' ) ) {
                 $this->blog_id = (string) BLOG_ID_CURRENT_SITE;
@@ -458 +462 @@
                 }
             }
-            if ( $network->path === '/' ) {
+            if ( '/' === $network->path ) {
                 $found = true;
                 break;