Fixed the "X is your new blog" message.

Redirect to the base domain to sign up
Removed cruft


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@578 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 8 insertions, 21 deletions

diff --git a/wp-inst/wp-signup.php b/wp-inst/wp-signup.php
index 2d7fa21..a8714dc 100644
--- a/wp-inst/wp-signup.php
+++ b/wp-inst/wp-signup.php
@@ -1,27 +1,14 @@
 <?php

 

-/*

-die('

-<div style="line-height: 1.6em; font-family:Verdana, Arial, Helvetica, sans-serif; width: 350px; margin: auto;">

-<p>Blog registration is temporarily disabled. Thanks for your patience. </p>

-

-<p align="right">&#8212; <em>Matt</em></p>

-

-</div>

-');

-

-

-

-

-die( 'Blog registration is disabled for a few minutes. Sorry for the interupption. Please try again later.'); // disabled for ibbackup

-*/

 require ('wp-config.php');

 

-//graceful_fail('Signups are disabled for a few minutes. Sorry! Please try again soon.');

-

 require_once( ABSPATH . WPINC . '/registration.php');

 

 do_action("signup_header");

+if( $current_blog->domain != $current_site->domain ) {

+	header( "Location: http://" . $current_site->domain . $current_site->path . "wp-signup.php" );

+	die();

+}

 

 get_header();

 ?>

@@ -170,7 +157,7 @@ function signup_another_blog($blog_id = '', $blog_title = '', $errors = '') {
 }

 

 function validate_another_blog_signup() {

-	global $current_user;

+	global $current_user, $current_site;

 

 	$result = validate_blog_form();

 	extract($result);

@@ -183,14 +170,14 @@ function validate_another_blog_signup() {
 	$public = (int) $_POST['blog_public'];

 	$meta = array ('lang_id' => 'en', 'public' => $public);

 

-	wpmu_create_blog($domain, $path, $blog_title, $current_user->id, $meta);

-	confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);		

+	wpmu_create_blog($domain, $current_site->path, $blog_title, $current_user->id, $meta);

+	confirm_another_blog_signup($domain, $current_site->path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);		

 }

 

 function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta) {

 ?>

 <h2><?php printf(__('%s Is Yours'), $domain) ?></h2>

-<p><?php printf(__('%1$s is your new blog.  <a href="%2$s">Login</a> as "%3$s" using your existing password.'), $domain, "http://${domain}${path}wp-login.php", $user_name) ?></p>

+<p><?php printf(__('<a href="%1$s">%2$s</a> is your new blog.  <a href="%3$s">Login</a> as "%4$s" using your existing password.'), "http://${domain}${path}", $domain, "http://${domain}${path}wp-login.php", $user_name) ?></p>

 <?php

 	do_action('signup_finished');

 }