summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-newblog.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-07-18 16:21:05 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-07-18 16:21:05 +0000
commit438e29775ea5b2f1d82b1199452fc91d13a03898 (patch)
treef86e062f300c26de3055eefe691e8b782fd1ce18 /wp-inst/wp-newblog.php
parent6ae757c9075393d9e9900ea41deaebd469638d96 (diff)
downloadwordpress-mu-438e29775ea5b2f1d82b1199452fc91d13a03898.tar.gz
wordpress-mu-438e29775ea5b2f1d82b1199452fc91d13a03898.tar.xz
wordpress-mu-438e29775ea5b2f1d82b1199452fc91d13a03898.zip
Fix for domain
Fix createBlog() call git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@39 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-newblog.php')
-rw-r--r--wp-inst/wp-newblog.php8
1 files changed, 2 insertions, 6 deletions
diff --git a/wp-inst/wp-newblog.php b/wp-inst/wp-newblog.php
index c065072..26be3fc 100644
--- a/wp-inst/wp-newblog.php
+++ b/wp-inst/wp-newblog.php
@@ -142,11 +142,7 @@ switch( $_POST[ 'stage' ] )
displayInitialForm( $_POST[ 'weblog_id' ], $weblog_title, $_POST[ 'admin_email' ], $_POST[ 'admin_login' ], 'adminform' );
$setup = false;
} elseif( $newBlogID == 'main' && isset( $_POST[ 'admin_pw' ] ) == true ) {
- $query = "SELECT ID
- FROM ".$wpdb->users."
- WHERE user_pass = '".md5( $_POST[ 'admin_pw' ] )."'
- AND user_login = 'admin'";
- $admin_id = $wpdb->get_var( $query );
+ $admin_id = $wpdb->get_var( "SELECT ID FROM ".$wpdb->users." WHERE user_pass = '".md5( $_POST[ 'admin_pw' ] )."' AND user_login = 'admin'" );
if( $admin_id != 1 ) {
displayInitialForm( $_POST[ 'weblog_id' ], $_POST[ 'weblog_title' ], $_POST[ 'admin_email' ], $_POST[ 'admin_login' ], 'adminform' );
$setup = false;
@@ -166,7 +162,7 @@ switch( $_POST[ 'stage' ] )
} else {
$url = 'http://'.$serverName.$scriptBaseName.$newBlogID."/";
}
- $err = createBlog( $_SERVER[ 'HTTP_HOST' ], $domain, $scriptBaseName, $newBlogID, $weblog_title, $admin_email, $newBlogID );
+ $err = createBlog( $newBlogID.".".$domain, $scriptBaseName, $newBlogID, $weblog_title, $admin_email );
if( $err == 'ok' ) {
displaySecondForm();
} else {