Changeset 13066 for trunk/wp-includes/ms-load.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/ms-load.php (modified) (3 diffs)

trunk/wp-includes/ms-load.php

@@ -76 +76 @@
 function get_current_site_name( $current_site ) {
     global $wpdb;
-    $current_site->site_name = wp_cache_get( $current_site->id . ':current_site_name', "site-options" );
+    $current_site->site_name = wp_cache_get( $current_site->id . ':current_site_name', 'site-options' );
     if ( ! $current_site->site_name ) {
-        $current_site->site_name = $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = %d AND meta_key = 'site_name'", $current_site->id ) );
-        if ( ! $current_site->site_name )
-            $current_site->site_name = ucfirst( $current_site->domain );
+        $current_site->site_name = wp_cache_get( $current_site->id . ':site_name', 'site-options' );
+        if ( ! $current_site->site_name ) {
+            $current_site->site_name = $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = %d AND meta_key = 'site_name'", $current_site->id ) );
+            if ( ! $current_site->site_name )
+                $current_site->site_name = ucfirst( $current_site->domain );
+        }
         wp_cache_set( $current_site->id . ':current_site_name', $current_site->site_name, 'site-options' );
     }
@@ -108 +111 @@
             $current_site->cookie_domain = $current_site->domain;
 
+        wp_load_core_site_options($current_site->id);
+
         return $current_site;
     }
@@ -117 +122 @@
     $sites = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); // usually only one site
     if ( 1 == count( $sites ) ) {
+        wp_load_core_site_options($current_site->id);
         $current_site = $sites[0];
         $path = $current_site->path;