X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/8f374b7233bc2815ccc387e448d208c5434eb961..6c8f14c09105d0afa4c1574215c59b5021040e76:/wp-admin/network/site-new.php diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php index b3cc84e5..db2e1f74 100644 --- a/wp-admin/network/site-new.php +++ b/wp-admin/network/site-new.php @@ -62,10 +62,10 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) { if ( is_subdomain_install() ) { $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain ); - $path = $base; + $path = $current_site->path; } else { $newdomain = $current_site->domain; - $path = $base . $domain . '/'; + $path = $current_site->path . $domain . '/'; } $password = 'N/A'; @@ -85,7 +85,10 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) { if ( !is_wp_error( $id ) ) { if ( !is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) ) update_user_option( $user_id, 'primary_blog', $id, true ); - $content_mail = sprintf( __( "New site created by %1s\n\nAddress: %2s\nName: %3s"), $current_user->user_login , get_site_url( $id ), stripslashes( $title ) ); + $content_mail = sprintf( __( 'New site created by %1$s + +Address: %2$s +Name: %3$s' ), $current_user->user_login , get_site_url( $id ), stripslashes( $title ) ); wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' ); wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) ); wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) ); @@ -127,7 +130,7 @@ if ( ! empty( $messages ) ) { domain . $current_site->path ?> ' . __( 'Only the characters a-z and 0-9 recommended.' ) . '
'; + echo '' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '
'; ?>