From 1d5b32b4db909b7118911bbd8d86f463ff122087 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Mon, 21 Jul 2008 09:48:36 +0000
Subject: Don't overwrite site_name, fixes #686, props Andy

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

(limited to 'wp-settings.php')

diff --git a/wp-settings.php b/wp-settings.php
index 599b16f..e9c2c25 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -299,7 +299,8 @@ if ( !defined('WP_PLUGIN_URL') )
 if ( !defined('PLUGINDIR') )
 	define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH.  For back compat.
 
-$current_site->site_name = get_site_option('site_name');
+if( !isset($current_site->site_name) )
+	$current_site->site_name = get_site_option('site_name');
 if( $current_site->site_name == false )
 	$current_site->site_name = ucfirst( $current_site->domain );
 
-- 
cgit