Changeset 25043

Timestamp:

08/16/2013 10:41:23 PM (12 years ago)

Author:

duck_

Message:

Introduce a notoptions cache for site options.

Props wonderboymusic. Fixes #19008.

File:

• trunk/src/wp-includes/option.php (modified) (7 diffs)

trunk/src/wp-includes/option.php

@@ -768 +768 @@
         return $pre;
 
+    // prevent non-existent options from triggering multiple queries
+    $notoptions = wp_cache_get( 'notoptions', 'site-options' );
+    if ( isset( $notoptions[$option] ) )
+        return apply_filters( 'default_site_option_' . $option, $default );
+
     if ( ! is_multisite() ) {
         $default = apply_filters( 'default_site_option_' . $option, $default );
@@ -785 +790 @@
                 wp_cache_set( $cache_key, $value, 'site-options' );
             } else {
+                $notoptions[$option] = true;
+                wp_cache_set( 'notoptions', $notoptions, 'site-options' );
                 $value = apply_filters( 'default_site_option_' . $option, $default );
             }
@@ -814 +821 @@
     global $wpdb;
 
+    wp_protect_special_option( $option );
+
     $value = apply_filters( 'pre_add_site_option_' . $option, $value );
 
@@ -821 +830 @@
         $cache_key = "{$wpdb->siteid}:$option";
 
-        if ( false !== get_site_option( $option ) )
-            return false;
+        // 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' );
+        if ( ! is_array( $notoptions ) || ! isset( $notoptions[$option] ) )
+            if ( false !== get_site_option( $option ) )
+                return false;
 
         $value = sanitize_option( $option, $value );
+
         wp_cache_set( $cache_key, $value, 'site-options' );
 
@@ -831 +844 @@
         $result = $wpdb->insert( $wpdb->sitemeta, array('site_id' => $wpdb->siteid, 'meta_key' => $option, 'meta_value' => $value ) );
         $value = $_value;
+
+        // This option exists now
+        $notoptions = wp_cache_get( 'notoptions', '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' );
+        }
     }
 
@@ -902 +922 @@
     global $wpdb;
 
+    wp_protect_special_option( $option );
+
     $oldvalue = get_site_option( $option );
     $value = apply_filters( 'pre_update_site_option_' . $option, $value, $oldvalue );
@@ -910 +932 @@
     if ( false === $oldvalue )
         return add_site_option( $option, $value );
+
+    $notoptions = wp_cache_get( 'notoptions', 'site-options' );
+    if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
+        unset( $notoptions[$option] );
+        wp_cache_set( 'notoptions', $notoptions, 'site-options' );
+    }
 
     if ( !is_multisite() ) {