Changeset 5788

Timestamp:

07/07/2007 04:06:29 AM (19 years ago)

Author:

markjaquith

Message:

Properly unset notoptions cache in add_option() so that get_option() and update_option() work on the same load. fixes #4429 for trunk

File:

• trunk/wp-includes/functions.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -315 +315 @@
         wp_protect_special_option($name);
 
-        // Make sure the option doesn't already exist we can check the cache before we ask for a db query
+        // 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', 'options');
-        if ( is_array($notoptions) && isset($notoptions[$name]) ) {
-                unset($notoptions[$name]);
-                wp_cache_set('notoptions', $notoptions, 'options');
-        } elseif ( false !== get_option($name) ) {
+        if ( !is_array($notoptions) || !isset($notoptions[$name]) )
+                if ( false !== get_option($name) )
                         return;
-        }
 
         $value = maybe_serialize($value);
@@ -333 +330 @@
         } else {
                 wp_cache_set($name, $value, 'options');
+        }
+
+        // This option exists now
+        $notoptions = wp_cache_get('notoptions', 'options'); // yes, again... we need it to be fresh
+        if ( is_array($notoptions) && isset($notoptions[$name]) ) {
+                unset($notoptions[$name]);
+                wp_cache_set('notoptions', $notoptions, 'options');
         }