summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-01-11 12:07:42 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-01-11 12:07:42 +0000
commit5d8662b68da29a98739bceec6f93b7340ed5222e (patch)
tree3d1ca641cef5d8e06ac677655fffc37209357304
parent6e5ca155592a0c8e39546da06bad30ab664ceb7e (diff)
downloadwordpress-mu-5d8662b68da29a98739bceec6f93b7340ed5222e.tar.gz
wordpress-mu-5d8662b68da29a98739bceec6f93b7340ed5222e.tar.xz
wordpress-mu-5d8662b68da29a98739bceec6f93b7340ed5222e.zip
Blurn Heesakkers fixed the sitemeta not found bug during install.
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@500 7be80a69-a1ef-0310-a953-fb0f7c49ff36
-rw-r--r--wp-inst/wp-settings.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/wp-inst/wp-settings.php b/wp-inst/wp-settings.php
index 274db1b..319be00 100644
--- a/wp-inst/wp-settings.php
+++ b/wp-inst/wp-settings.php
@@ -261,7 +261,9 @@ require (ABSPATH . WPINC . '/version.php');
require_once( ABSPATH . WPINC . '/wpmu-functions.php' );
-$current_site->site_name = get_site_option('site_name');
+if( defined( "WP_INSTALLING" ) == false ) {
+ $current_site->site_name = get_site_option('site_name');
+}
if( $current_site->site_name == false ) {
$current_site->site_name = ucfirst( $current_site->domain );