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

Timestamp:

02/12/2010 05:06:43 PM (16 years ago)

Author:

ryan

Message:

Preload commonly loaded site options when running multisite without a persistent cache. Introduce wp_cache_reset() and call it instead of wp_cache_init() when re-initing after the blog ID chanages to avoid throwing out the entire cache. Pass cached site options through the site option filter when fetching.

File:

• trunk/wp-includes/functions.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -436 +436 @@
 
     return $alloptions;
+}
+
+function wp_load_core_site_options( $site_id = null ) {
+    global $wpdb, $_wp_using_ext_object_cache;
+
+    if ( !is_multisite() || $_wp_using_ext_object_cache || defined( 'WP_INSTALLING' ) )
+        return;
+
+    if ( empty($site_id) )
+        $site_id = $wpdb->siteid;
+
+    $core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'dashboard_blog');
+
+    $core_options_in = "'" . implode("', '", $core_options) . "'";
+    $options = $wpdb->get_results( $wpdb->prepare("SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $site_id) );
+
+    foreach ( $options as $option ) {
+        $key = $option->meta_key;
+        $cache_key = "{$site_id}:$key";
+        $option->meta_value = maybe_unserialize( $option->meta_value );
+
+        wp_cache_set( $cache_key, $option->meta_value, 'site-options' );
+    }
 }
 
@@ -3321 +3344 @@
         $value = get_option($key, $default);
     } else {
-        $cache_key = "{$wpdb->siteid}:$key";
-
-        if ( $use_cache == true && $value = wp_cache_get($cache_key, 'site-options') )
-            return $value;
-
-        $value = $wpdb->get_var( $wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $key, $wpdb->siteid) );
-
-        if ( is_null($value) )
-            $value = $default;
-
-        $value = maybe_unserialize( $value );
-
-        wp_cache_set( $cache_key, $value, 'site-options' );
+        $cache_key = "$wpdb->siteid:$key";
+        if ( $use_cache )
+            $value = wp_cache_get($cache_key, 'site-options');
+
+        if ( false === $value ) {
+            $value = $wpdb->get_var( $wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $key, $wpdb->siteid) );
+
+            if ( is_null($value) )
+                $value = $default;
+
+            $value = maybe_unserialize( $value );
+
+            wp_cache_set( $cache_key, $value, 'site-options' );
+        }
     }