diff options
Diffstat (limited to 'wp-inst')
| -rw-r--r-- | wp-inst/wp-includes/wpmu-functions.php | 2 | ||||
| -rw-r--r-- | wp-inst/wp-newblog.php | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/wp-inst/wp-includes/wpmu-functions.php b/wp-inst/wp-includes/wpmu-functions.php index e339dbd..f2310ee 100644 --- a/wp-inst/wp-includes/wpmu-functions.php +++ b/wp-inst/wp-includes/wpmu-functions.php @@ -99,6 +99,8 @@ function createBlog( $domain, $path, $username, $weblog_title, $admin_email, $so // Check if the username has been used already. We should return an error message. if( $wpdb->get_var( "SELECT ID FROM ".$wpdb->users." WHERE user_email = '".$admin_email."'" ) == true ) return "error: email used"; + if( strpos( " " . $username, "_" ) != false ) + return "error: username must not contain _"; $errmsg = false ; $errmsg = apply_filters( "createBlog_check", $errmsg ); diff --git a/wp-inst/wp-newblog.php b/wp-inst/wp-newblog.php index af79611..2582b8b 100644 --- a/wp-inst/wp-newblog.php +++ b/wp-inst/wp-newblog.php @@ -37,7 +37,7 @@ function displayInitialForm( $weblog_id = '', $weblog_title = '', $admin_email = if( strlen( $errormsg[ 'weblog_id' ] ) > 3 ) { ?><p><strong>Warning! <?php echo $errormsg[ 'weblog_id' ] ?></strong></p><?php } - print '<input name="weblog_id" type="text" id="weblog_id" value="'.$weblog_id.'" maxlength="50" /><br />(<strong>Your address will be username.wordpress.com.</strong> Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)</td> </tr>'; + print '<input name="weblog_id" type="text" id="weblog_id" value="'.$weblog_id.'" maxlength="50" style="width:40%; text-align: right; font-size: 30px;" /><span style="font-size: 30px">.wordpress.com</span><br />(<strong>Your address will be username.wordpress.com.</strong> Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)</td> </tr>'; if( $errormsg[ 'weblog_title' ] != '' ) { print '<tr class="error">'; } else { @@ -47,7 +47,7 @@ function displayInitialForm( $weblog_id = '', $weblog_title = '', $admin_email = if( strlen( $errormsg[ 'weblog_title' ] ) > 3 ) { ?><p><strong>Warning! <?php echo $errormsg[ 'weblog_title' ] ?></strong></p><?php } - print '<input name="weblog_title" type="text" id="weblog_title" value="'.wp_specialchars( $weblog_title, 1 ).'" /><br /> (Don\'t worry, you can change it later.)</td> + print '<input name="weblog_title" type="text" id="weblog_title" value="'.wp_specialchars( $weblog_title, 1 ).'" /></td> </tr>'; if( $errormsg[ 'admin_email' ] != '' ) { print '<tr class="error">'; @@ -227,6 +227,10 @@ switch( $_POST[ 'stage' ] ) $errormsg[ 'weblog_id' ] = "Sorry, that blog already exists!"; } elseif( $err == 'error: email domain not allowed' ) { $errormsg[ 'admin_email' ] = "Sorry, that email address is not allowed!"; + } elseif( $err == 'error: email used' ) { + $errormsg[ 'admin_email' ] = "Sorry, that email address is already used!"; + } elseif( $err == 'error: username must not contain _' ) { + $errormsg[ 'weblog_id' ] = "Sorry, usernames may not contain the character '_'!"; } else { $errormsg[ 'weblog_id' ] = "Sorry, that blog already exists!"; } |