Changeset 15551

Timestamp:

08/31/2010 06:17:20 PM (14 years ago)

Author:

ryan

Message:

Cache to site_name instead of current_site_name. Props benward. fixes #14461

File:

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

trunk/wp-includes/ms-load.php

@@ -88 +88 @@
 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 . ':site_name', 'site-options' );
     if ( ! $current_site->site_name ) {
-        $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' );
-    }
+        $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 . ':site_name', $current_site->site_name, 'site-options' );
+
     return $current_site;
 }