Ticket #11644: 11644.get_blog_option.2.2.diff

wp-includes/ms-functions.php

@@ -249 +249 @@
 
         $key = $blog_id."-".$setting."-blog_option";
         $value = wp_cache_get( $key, "site-options" );
-        if ( $value == null ) {
+
+        if ( $value == null && $blog_id == $wpdb->blogid ) {
+                $value = get_option( $setting, 'noop' );
+                if ( $value == false )
+                        wp_cache_set( $key, 'falsevalue', 'site-options' );
+                else
+                        wp_cache_set( $key, $value, 'site-options' );
+        } elseif ( $value == null && $blog_id != $wpdb->blogid ) {
                 $blog_prefix = $wpdb->get_blog_prefix( $blog_id );
                 $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$blog_prefix}options WHERE option_name = %s", $setting ) );
                 if ( is_object( $row ) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values