From 2cbe26f5a201c8b6090d2d5faf337a6bb3f14cf0 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Sat, 13 Aug 2005 08:09:57 +0000
Subject: Fix site_name

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@186 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-inst/wp-settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-inst/wp-settings.php b/wp-inst/wp-settings.php
index 80dacd3..3c3537e 100644
--- a/wp-inst/wp-settings.php
+++ b/wp-inst/wp-settings.php
@@ -101,7 +101,7 @@ $current_site = $wpdb->get_row("SELECT * FROM $wpdb->site WHERE id='$site_id'");
 if( $current_site == false ) {
     is_installed();
 }
-$current_site->site_name = $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = 'site_name'" );
+$current_site->site_name = $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = '$site_id' AND meta_key = 'site_name'" );
 if( $current_site->site_name == false ) {
 	$current_site->site_name = ucfirst( $current_site->domain );
 	include( ABSPATH . "wp-admin/wpmu-upgrade.inc.php" );
-- 
cgit