Changeset 27888 for branches/3.7

Timestamp:

04/01/2014 04:06:27 AM (11 years ago)

Author:

nacin

Message:

Prefix the notoptions cache key in the multisite site-options group with $wpdb->siteid to avoid collisions.

Merges [26304] (and [26305]) from 3.8 to the 3.7 branch.

props wonderboymusic.
fixes #25883.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src/wp-includes/option.php (modified) (6 diffs)
• tests/phpunit/tests/option/siteOption.php (modified) (1 diff)

branches/3.7/src/wp-includes/option.php

@@ -758 +758 @@
 
     // prevent non-existent options from triggering multiple queries
-    $notoptions = wp_cache_get( 'notoptions', 'site-options' );
+    $notoptions_key = "{$wpdb->siteid}:notoptions";
+    $notoptions = wp_cache_get( $notoptions_key, 'site-options' );
     if ( isset( $notoptions[$option] ) )
         return apply_filters( 'default_site_option_' . $option, $default );
@@ -780 +781 @@
             } else {
                 $notoptions[$option] = true;
-                wp_cache_set( 'notoptions', $notoptions, 'site-options' );
+                wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
                 $value = apply_filters( 'default_site_option_' . $option, $default );
             }
@@ -813 +814 @@
 
     $value = apply_filters( 'pre_add_site_option_' . $option, $value );
+    $notoptions_key = "{$wpdb->siteid}:notoptions";
 
     if ( !is_multisite() ) {
@@ -820 +822 @@
 
         // Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
-        $notoptions = wp_cache_get( 'notoptions', 'site-options' );
+        $notoptions = wp_cache_get( $notoptions_key, 'site-options' );
         if ( ! is_array( $notoptions ) || ! isset( $notoptions[$option] ) )
             if ( false !== get_site_option( $option ) )
@@ -836 +838 @@
 
         // This option exists now
-        $notoptions = wp_cache_get( 'notoptions', 'site-options' ); // yes, again... we need it to be fresh
+        $notoptions = wp_cache_get( $notoptions_key, 'site-options' ); // yes, again... we need it to be fresh
         if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
             unset( $notoptions[$option] );
-            wp_cache_set( 'notoptions', $notoptions, 'site-options' );
+            wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
         }
     }
@@ -923 +925 @@
         return add_site_option( $option, $value );
 
-    $notoptions = wp_cache_get( 'notoptions', 'site-options' );
+    $notoptions_key = "{$wpdb->siteid}:notoptions";
+    $notoptions = wp_cache_get( $notoptions_key, 'site-options' );
     if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
         unset( $notoptions[$option] );
-        wp_cache_set( 'notoptions', $notoptions, 'site-options' );
+        wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
     }
 

branches/3.7/tests/phpunit/tests/option/siteOption.php

@@ -91 +91 @@
         $this->assertFalse( get_site_option( $option ) );
     }
+
+    /**
+     * @group multisite
+     */
+    function test_site_notoptions() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( 'Should only run in multisite' );
+        }
+
+        global $wpdb;
+        $notoptions_key = "{$wpdb->siteid}:notoptions";
+
+        $_notoptions = wp_cache_get( 'notoptions', 'site-options' );
+        $this->assertEmpty( $_notoptions );
+        $_notoptions1 = wp_cache_get( $notoptions_key, 'site-options' );
+        $this->assertEmpty( $_notoptions1 );
+
+        get_site_option( 'burrito' );
+
+        $notoptions = wp_cache_get( 'notoptions', 'site-options' );
+        $this->assertEmpty( $notoptions );
+        $notoptions1 = wp_cache_get( $notoptions_key, 'site-options' );
+        $this->assertNotEmpty( $notoptions1 );
+    }
 }