Changes from trunk/wp-signup.php at r16755 to branches/3.0/wp-signup.php at r15452

File:

• branches/3.0/wp-signup.php (modified) (4 diffs)

branches/3.0/wp-signup.php

@@ -7 +7 @@
 
 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 ) {
@@ -23 +24 @@
 
 if ( !is_multisite() ) {
-    wp_redirect( site_url('wp-login.php?action=register') );
+    wp_redirect( get_option( 'siteurl' ) . "/wp-login.php?action=register" );
     die();
 }
@@ -81 +82 @@
 
     if ( !is_user_logged_in() ) {
+        print '(<strong>' . __( 'Your address will be ' );
         if ( !is_subdomain_install() )
-            $site = $current_site->domain . $current_site->path . __( 'sitename' );
+            print $current_site->domain . $current_site->path . __( 'sitename' );
         else
-            $site = __( 'domain' ) . '.' . $site_domain . $current_site->path;
-        echo '<p>(<strong>' . sprintf( __('Your address will be %s.'), $site ) . '</strong>) ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
+            print __( 'domain.' ) . $site_domain . $current_site->path;
+        echo '.</strong>) ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed, so choose carefully!' ) . '</p>';
     }
 
@@ -392 +394 @@
 
 if ( is_super_admin() )
-    echo '<div class="mu_alert">' . sprintf( __( 'Greetings Site Administrator! You are currently allowing &#8220;%s&#8221; registrations. To change or disable registration go to your <a href="%s">Options page</a>.' ), $i18n_signup[$active_signup], esc_url( network_admin_url( 'settings.php' ) ) ) . '</div>';
+    echo '<div class="mu_alert">' . sprintf( __( 'Greetings Site Administrator! You are currently allowing &#8220;%s&#8221; registrations. To change or disable registration go to your <a href="%s">Options page</a>.' ), $i18n_signup[$active_signup], esc_url( network_admin_url( 'ms-options.php' ) ) ) . '</div>';
 
 $newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;