summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-09-27 18:48:32 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-09-27 18:48:32 +0000
commitbafa5945fee3311ab6d4a0c442376345a019a7be (patch)
tree6b709cb28ad1fc56335e72cc4490c58444afed7c
parentfc886eb2611a6f9dd06ed1dcd98d18aea823b162 (diff)
downloadwordpress-mu-bafa5945fee3311ab6d4a0c442376345a019a7be.tar.gz
wordpress-mu-bafa5945fee3311ab6d4a0c442376345a019a7be.tar.xz
wordpress-mu-bafa5945fee3311ab6d4a0c442376345a019a7be.zip
Don't reset cookies during signup/activation (thanks Ryan)
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@776 7be80a69-a1ef-0310-a953-fb0f7c49ff36
-rw-r--r--wp-includes/wpmu-functions.php4
-rw-r--r--wp-signup.php1
2 files changed, 4 insertions, 1 deletions
diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php
index cc4b176..823e4ee 100644
--- a/wp-includes/wpmu-functions.php
+++ b/wp-includes/wpmu-functions.php
@@ -1188,7 +1188,9 @@ function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id
if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
return new WP_Error('insert_blog', __('Could not create blog.'));
- //define( "WP_INSTALLING", true );
+ if ( !defined("WP_INSTALLING") )
+ define( "WP_INSTALLING", true );
+
switch_to_blog($blog_id);
install_blog($blog_id, $title);
diff --git a/wp-signup.php b/wp-signup.php
index d5d9453..c20a3c1 100644
--- a/wp-signup.php
+++ b/wp-signup.php
@@ -1,5 +1,6 @@
<?php
+define( "WP_INSTALLING", true );
require ('wp-config.php');
require_once( ABSPATH . WPINC . '/registration.php');