Ticket #24685: 24685.diff

wp-includes/option.php

@@ -456 +456 @@
                 if ( ! defined( 'WP_INSTALLING' ) ) {
                         // If option is not in alloptions, it is not autoloaded and thus has a timeout
                         $alloptions = wp_load_alloptions();
-                        if ( !isset( $alloptions[$transient_option] ) ) {
+                        if ( ! isset( $alloptions[$transient_option] ) ) {
                                 $transient_timeout = '_transient_timeout_' . $transient;
                                 if ( get_option( $transient_timeout ) < time() ) {
                                         delete_option( $transient_option  );
                                         delete_option( $transient_timeout );
-                                        return false;
+                                        $value = false;
                                 }
                         }
                 }
 
-                $value = get_option( $transient_option );
+                if ( ! isset( $value ) )
+                        $value = get_option( $transient_option );
         }
 
         return apply_filters( 'transient_' . $transient, $value );
@@ -1001 +1002 @@
                         if ( false !== $timeout && $timeout < time() ) {
                                 delete_site_option( $transient_option  );
                                 delete_site_option( $transient_timeout );
-                                return false;
+                                $value = false;
                         }
                 }
 
-                $value = get_site_option( $transient_option );
+                if ( ! isset( $value ) )
+                        $value = get_site_option( $transient_option );
         }
 
         return apply_filters( 'site_transient_' . $transient, $value );