From db718fc98770226f25f87007ecc2cb7df24b2423 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 31 Aug 2010 18:17:20 +0000 Subject: [PATCH] Cache to site_name instead of current_site_name. Props benward. fixes #14461 git-svn-id: http://svn.automattic.com/wordpress/trunk@15551 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/ms-load.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php index fc16faac9..b12f9a537 100644 --- a/wp-includes/ms-load.php +++ b/wp-includes/ms-load.php @@ -87,16 +87,15 @@ function ms_site_check() { */ 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; }