X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/542cf06a610bc430421351ace7a2cc45f393b990..ae01624bdce6b71c47e08e8a0287de58284a6b73:/wp-signup.php
diff --git a/wp-signup.php b/wp-signup.php
index 28b561a9..c2ab566b 100644
--- a/wp-signup.php
+++ b/wp-signup.php
@@ -6,7 +6,6 @@ require( dirname(__FILE__) . '/wp-load.php' );
add_action( 'wp_head', 'signuppageheaders' ) ;
require( './wp-blog-header.php' );
-require_once( ABSPATH . WPINC . '/registration.php' );
if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) == true ) {
wp_redirect( network_home_url() );
@@ -23,7 +22,7 @@ function signuppageheaders() {
}
if ( !is_multisite() ) {
- wp_redirect( get_option( 'siteurl' ) . "/wp-login.php?action=register" );
+ wp_redirect( site_url('wp-login.php?action=register') );
die();
}
@@ -81,12 +80,11 @@ function show_blog_form($blogname = '', $blog_title = '', $errors = '') {
echo '.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . '
';
if ( !is_user_logged_in() ) {
- print '(' . __( 'Your address will be ' );
if ( !is_subdomain_install() )
- print $current_site->domain . $current_site->path . __( 'sitename' );
+ $site = $current_site->domain . $current_site->path . __( 'sitename' );
else
- print __( 'domain.' ) . $site_domain . $current_site->path;
- echo '.) ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '
(' . sprintf( __('Your address will be %s.'), $site ) . ') ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '
'; } // Blog Title @@ -393,7 +391,7 @@ $i18n_signup['blog'] = _x('blog', 'Multisite active signup type'); $i18n_signup['user'] = _x('user', 'Multisite active signup type'); if ( is_super_admin() ) - echo '