Ticket #28664: 28664-load_alloptions_cache_handling.diff

src/wp-includes/option.php

@@ -158 +158 @@
 function wp_load_alloptions() {
         global $wpdb;
 
-        if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
-                $alloptions = wp_cache_get( 'alloptions', 'options' );
-        else
+        $use_cache = !defined( 'WP_INSTALLING' ) || !is_multisite();
+
+        if ( $use_cache ) {
+                $cache_data = wp_cache_get( 'alloptions', 'options' );
+                $alloptions = $cache_data;
+        } else {
                 $alloptions = false;
+        }
 
-        if ( !$alloptions ) {
+        // make sure the cached object is an array; on rare events this can be a zero
+        if ( ! is_array($alloptions) ) {
+
                 $suppress = $wpdb->suppress_errors();
                 if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) )
                         $alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
                 $wpdb->suppress_errors($suppress);
+
                 $alloptions = array();
                 foreach ( (array) $alloptions_db as $o ) {
-                        $alloptions[$o->option_name] = $o->option_value;
+                        $alloptions[ $o->option_name ] = $o->option_value;
                 }
-                if ( !defined( 'WP_INSTALLING' ) || !is_multisite() )
-                        wp_cache_add( 'alloptions', $alloptions, 'options' );
+
+                if ( $use_cache ) {
+                        $cache_added = false;
+
+                        // if original result was a false, add the data:
+                        if ( false === $cache_data ) {
+                                $cache_added = wp_cache_add( 'alloptions', $alloptions, 'options' );
+                        }
+
+                        // if original result was 'data' or adding failed:
+                        if ( false === $cache_added ) {
+                                wp_cache_set( 'alloptions', $alloptions, 'options' );
+                        }
+                }
         }
 
         return $alloptions;