Changeset 42833

Timestamp:

03/13/2018 03:36:14 PM (7 years ago)

Author:

flixos90

Message:

Multisite: Ensure the {$network_id}:notoptions array is set in cache in get_network_option().

Prior to this change, the {$network_id}:notoptions cache would only be fetched, but not set, unless the actual database lookup would be unsuccessful. This enhancement slightly improves performance by preventing unnecessary external object cache lookups if one is used.

Fixes #43506.

Location:

trunk

Files:

• src/wp-includes/option.php (modified) (2 diffs)
• tests/phpunit/tests/option/networkOption.php (modified) (1 diff)

trunk/src/wp-includes/option.php

@@ -1248 +1248 @@
     $notoptions     = wp_cache_get( $notoptions_key, 'site-options' );
 
-    if ( isset( $notoptions[ $option ] ) ) {
+    if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) {
 
         /**
@@ -1294 +1294 @@
             }
         }
+    }
+
+    if ( ! is_array( $notoptions ) ) {
+        $notoptions = array();
+        wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
     }
 

trunk/tests/phpunit/tests/option/networkOption.php

@@ -122 +122 @@
         );
     }
+
+    /**
+     * @ticket 43506
+     */
+    public function test_get_network_option_sets_notoptions_if_option_found() {
+        $network_id     = get_current_network_id();
+        $notoptions_key = "$network_id:notoptions";
+
+        $original_cache = wp_cache_get( $notoptions_key, 'site-options' );
+        if ( false !== $original_cache ) {
+            wp_cache_delete( $notoptions_key, 'site-options' );
+        }
+
+        // Retrieve any existing option.
+        get_network_option( $network_id, 'site_name' );
+
+        $cache = wp_cache_get( $notoptions_key, 'site-options' );
+        if ( false !== $original_cache ) {
+            wp_cache_set( $notoptions_key, $original_cache, 'site-options' );
+        }
+
+        $this->assertSame( array(), $cache );
+    }
+
+    /**
+     * @ticket 43506
+     */
+    public function test_get_network_option_sets_notoptions_if_option_not_found() {
+        $network_id     = get_current_network_id();
+        $notoptions_key = "$network_id:notoptions";
+
+        $original_cache = wp_cache_get( $notoptions_key, 'site-options' );
+        if ( false !== $original_cache ) {
+            wp_cache_delete( $notoptions_key, 'site-options' );
+        }
+
+        // Retrieve any non-existing option.
+        get_network_option( $network_id, 'this_does_not_exist' );
+
+        $cache = wp_cache_get( $notoptions_key, 'site-options' );
+        if ( false !== $original_cache ) {
+            wp_cache_set( $notoptions_key, $original_cache, 'site-options' );
+        }
+
+        $this->assertSame( array( 'this_does_not_exist' => true ), $cache );
+    }
 }