X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/b22765f41bf0b2021b9beb9120ee0ac91fa89292..HEAD:/wp-signup.php?ds=sidebyside
diff --git a/wp-signup.php b/wp-signup.php
index 99bd2afb..6cf96b5c 100644
--- a/wp-signup.php
+++ b/wp-signup.php
@@ -100,7 +100,7 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
$errors = new WP_Error();
}
- $current_site = get_current_site();
+ $current_network = get_network();
// Blog name
if ( !is_subdomain_install() )
echo '';
@@ -112,15 +112,15 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
' . $current_site->domain . $current_site->path . '
';
+ echo '' . $current_network->domain . $current_network->path . '
';
else
- echo '.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . '
';
+ echo '.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_network->domain ) ) . '
';
if ( ! is_user_logged_in() ) {
if ( ! is_subdomain_install() ) {
- $site = $current_site->domain . $current_site->path . __( 'sitename' );
+ $site = $current_network->domain . $current_network->path . __( 'sitename' );
} else {
- $site = __( 'domain' ) . '.' . $site_domain . $current_site->path;
+ $site = __( 'domain' ) . '.' . $site_domain . $current_network->path;
}
/* translators: %s: site address */
@@ -304,7 +304,7 @@ function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) {
$blog_title = $filtered_results['blog_title'];
$errors = $filtered_results['errors'];
- echo '
' . __( 'There was a problem, please correct the form below and try again.' ) . '
'; @@ -532,7 +532,7 @@ function signup_user( $user_name = '', $user_email = '', $errors = '' ) {