summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-07-13 10:50:45 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-07-13 10:50:45 +0000
commita9abfc5f893560f24d7bee62944d80a4bfbae78c (patch)
tree1fe854e2351c6f6059a868c9069fdeb883343b84
parent3431effe877981ccd3aa5e6406f3344df67a77aa (diff)
downloadwordpress-mu-a9abfc5f893560f24d7bee62944d80a4bfbae78c.tar.gz
wordpress-mu-a9abfc5f893560f24d7bee62944d80a4bfbae78c.tar.xz
wordpress-mu-a9abfc5f893560f24d7bee62944d80a4bfbae78c.zip
Only show one logo on last install page.
Fix theme update_options() bug in install (#80) git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@673 7be80a69-a1ef-0310-a953-fb0f7c49ff36
-rw-r--r--index-install.php1
-rw-r--r--wp-settings.php3
2 files changed, 2 insertions, 2 deletions
diff --git a/index-install.php b/index-install.php
index 904537f..fc2fe11 100644
--- a/index-install.php
+++ b/index-install.php
@@ -433,7 +433,6 @@ switch( $_POST[ 'action' ] ) {
make_db_current_silent();
populate_options();
do_htaccess( 'htaccess.dist', '.htaccess', $base, '');
- printheader();
step3();
break;
case "step3":
diff --git a/wp-settings.php b/wp-settings.php
index 3c83cd9..f76e02a 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -266,7 +266,8 @@ $wp_query = new WP_Query();
$wp_rewrite = new WP_Rewrite();
$wp = new WP();
-validate_current_theme();
+if( defined( "WP_INSTALLING" ) == false )
+ validate_current_theme();
define('TEMPLATEPATH', get_template_directory());
// Load the default text localization domain.