Changeset 13116

Timestamp:

02/13/2010 06:56:50 PM (15 years ago)

Author:

wpmuguru

Message:

use object cache on get_blog_option on current blog, props sivel, See #11644

File:

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

trunk/wp-includes/ms-functions.php

@@ -251 +251 @@
     $value = wp_cache_get( $key, "site-options" );
     if ( $value == null ) {
-        $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
-            $value = $row->option_value;
-            if ( $value == false )
+        if ( $blog_id == $wpdb->blogid ) {
+            $value = get_option( $setting, $default );
+            $notoptions = wp_cache_get( 'notoptions', 'options' );
+            if ( isset( $notoptions[$setting] ) )
+                wp_cache_set( $key, 'noop', 'site-options' );
+            elseif ( $value == false )
                 wp_cache_set( $key, 'falsevalue', 'site-options' );
             else
                 wp_cache_set( $key, $value, 'site-options' );
-        } else { // option does not exist, so we must cache its non-existence
-            wp_cache_set( $key, 'noop', 'site-options' );
-            $value = $default;
+        } else {
+            $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
+                $value = $row->option_value;
+                if ( $value == false )
+                    wp_cache_set( $key, 'falsevalue', 'site-options' );
+                else
+                    wp_cache_set( $key, $value, 'site-options' );
+            } else { // option does not exist, so we must cache its non-existence
+                wp_cache_set( $key, 'noop', 'site-options' );
+                $value = $default;
+            }
         }
     } elseif ( $value == 'noop' ) {