diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-21 09:48:36 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-21 09:48:36 +0000 |
| commit | 1d5b32b4db909b7118911bbd8d86f463ff122087 (patch) | |
| tree | 86c928a414b8de38f614bc7e2646f328318bdddc | |
| parent | 490eb72e485f0c43c2d58fee4c0a5c16fdca0583 (diff) | |
| download | wordpress-mu-1d5b32b4db909b7118911bbd8d86f463ff122087.tar.gz wordpress-mu-1d5b32b4db909b7118911bbd8d86f463ff122087.tar.xz wordpress-mu-1d5b32b4db909b7118911bbd8d86f463ff122087.zip | |
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
| -rw-r--r-- | wp-settings.php | 3 |
1 files changed, 2 insertions, 1 deletions
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 ); |