diff --git a/src/wp-admin/css/install.css b/src/wp-admin/css/install.css index 5667deb4a8..66228912a8 100644 --- a/src/wp-admin/css/install.css +++ b/src/wp-admin/css/install.css @@ -152,6 +152,8 @@ submit { } .form-table input[type=text], +.form-table input[type=email], +.form-table input[type=url], .form-table input[type=password] { width: 206px; } @@ -295,6 +297,8 @@ body.rtl, } .form-table td input[type="text"], + .form-table td input[type="email"], + .form-table td input[type="url"], .form-table td input[type="password"], .form-table td select, .form-table td textarea, diff --git a/src/wp-admin/install.php b/src/wp-admin/install.php index 8c958953fc..732c979d64 100644 --- a/src/wp-admin/install.php +++ b/src/wp-admin/install.php @@ -98,7 +98,7 @@ function display_setup_form( $error = null ) { ?>

-
+ @@ -134,7 +134,7 @@ function display_setup_form( $error = null ) { - diff --git a/src/wp-admin/network/settings.php b/src/wp-admin/network/settings.php index 3497ddb007..663220ccf7 100644 --- a/src/wp-admin/network/settings.php +++ b/src/wp-admin/network/settings.php @@ -85,7 +85,7 @@ if ( isset( $_GET['updated'] ) ) {

- +

+

@@ -99,7 +99,7 @@ if ( isset( $_GET['updated'] ) ) {
- +

diff --git a/src/wp-admin/network/site-new.php b/src/wp-admin/network/site-new.php index 6a6cac993f..d8024400d5 100644 --- a/src/wp-admin/network/site-new.php +++ b/src/wp-admin/network/site-new.php @@ -119,7 +119,7 @@ if ( ! empty( $messages ) ) { foreach ( $messages as $msg ) echo '

' . $msg . '

'; } ?> - + @@ -140,7 +140,7 @@ if ( ! empty( $messages ) ) { - + diff --git a/src/wp-admin/options-general.php b/src/wp-admin/options-general.php index 96ad5e1840..c2f88a2ebe 100644 --- a/src/wp-admin/options-general.php +++ b/src/wp-admin/options-general.php @@ -86,7 +86,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

- +

@@ -102,16 +102,16 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); - + - - @@ -130,7 +130,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); -
class="regular-text code" /> class="regular-text code" />
class="regular-text code" /> + class="regular-text code" />

to be different from the directory you installed WordPress.'); ?>

+

+

The new address will not become active until confirmed.') ?>

-> +> @@ -401,7 +401,7 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c - - + ' . __( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '

'; $label = __('E-mail'); + $type = 'email'; } else { echo '

' . __( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '

'; $label = __('E-mail or Username'); + $type = 'text'; } ?> -> +>
+ ID . '_new_email' ); if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) : ?> @@ -414,7 +414,7 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
- + @@ -334,7 +336,7 @@ if ( current_user_can( 'create_users') ) { ?>

-> +> - + @@ -371,7 +373,7 @@ $new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unsl - + ' . __('Register For This Site') . '

', $errors); ?> - +

+

get_error_message('user_email') ) { ?>

-
+
get_error_message('generic') ) { echo '

' . $errmsg . '

'; @@ -435,7 +435,7 @@ function signup_user( $user_name = '', $user_email = '', $errors = '' ) { ?>

site_name ) ?>

- +