Changeset 19012 for trunk/wp-includes/functions.php

Timestamp:

10/19/2011 09:06:50 PM (14 years ago)

Author:

duck_

Message:

Don't cache default value in get_site_option() for non-existent options. Fixes #18955.

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -3799 +3799 @@
 
             // Has to be get_row instead of get_var because of funkiness with 0, false, null values
-            if ( is_object( $row ) )
+            if ( is_object( $row ) ) {
                 $value = $row->meta_value;
-            else
+                $value = maybe_unserialize( $value );
+                wp_cache_set( $cache_key, $value, 'site-options' );
+            } else {
                 $value = $default;
-
-            $value = maybe_unserialize( $value );
-
-            wp_cache_set( $cache_key, $value, 'site-options' );
+            }
         }
     }