Skip to content

Commit 7c2f6dd

Browse files
joedolsonjoedolson
committed
Login and Registration: Required fields in network registration.
Properly label site and user information on the network registration screen with the HTML5 required attribute and clarify the values expected for the site domain and subdirectory fields. Props SteelWagstaff, henrywright, sabernhardt. Fixes #54344. git-svn-id: https://develop.svn.wordpress.org/trunk@54192 602fd350-edb4-49c9-b593-d223f7449a82
1 parent a091aad commit 7c2f6dd

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

‎src/wp-signup.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
115115
$current_network = get_network();
116116
// Blog name.
117117
if ( ! is_subdomain_install() ) {
118-
echo '<label for="blogname">' . __( 'Site Name:' ) . '</label>';
118+
echo '<label for="blogname">' . __( 'Site Name (subdirectory only):' ) . '</label>';
119119
} else {
120-
echo '<label for="blogname">' . __( 'Site Domain:' ) . '</label>';
120+
echo '<label for="blogname">' . __( 'Site Domain (subdomain only):' ) . '</label>';
121121
}
122122

123123
$errmsg_blogname = $errors->get_error_message( 'blogname' );
@@ -128,10 +128,10 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
128128
}
129129

130130
if ( ! is_subdomain_install() ) {
131-
echo '<div class="wp-signup-blogname"><span class="prefix_address" id="prefix-address">' . $current_network->domain . $current_network->path . '</span><input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" autocomplete="off" aria-describedby="' . $errmsg_blogname_aria . 'prefix-address" /></div>';
131+
echo '<div class="wp-signup-blogname"><span class="prefix_address" id="prefix-address">' . $current_network->domain . $current_network->path . '</span><input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" autocomplete="off" required="required" aria-describedby="' . $errmsg_blogname_aria . 'prefix-address" /></div>';
132132
} else {
133133
$site_domain = preg_replace( '|^www\.|', '', $current_network->domain );
134-
echo '<div class="wp-signup-blogname"><input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" autocomplete="off" aria-describedby="' . $errmsg_blogname_aria . 'suffix-address" /><span class="suffix_address" id="suffix-address">.' . esc_html( $site_domain ) . '</span></div>';
134+
echo '<div class="wp-signup-blogname"><input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" autocomplete="off" required="required" aria-describedby="' . $errmsg_blogname_aria . 'suffix-address" /><span class="suffix_address" id="suffix-address">.' . esc_html( $site_domain ) . '</span></div>';
135135
}
136136

137137
if ( ! is_user_logged_in() ) {
@@ -159,7 +159,7 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
159159
$errmsg_blog_title_aria = ' aria-describedby="wp-signup-blog-title-error"';
160160
echo '<p class="error" id="wp-signup-blog-title-error">' . $errmsg_blog_title . '</p>';
161161
}
162-
echo '<input name="blog_title" type="text" id="blog_title" value="' . esc_attr( $blog_title ) . '" autocomplete="off"' . $errmsg_blog_title_aria . ' />';
162+
echo '<input name="blog_title" type="text" id="blog_title" value="' . esc_attr( $blog_title ) . '" required="required" autocomplete="off"' . $errmsg_blog_title_aria . ' />';
163163
?>
164164

165165
<?php
@@ -276,7 +276,7 @@ function show_user_form( $user_name = '', $user_email = '', $errors = '' ) {
276276
echo '<p class="error" id="wp-signup-username-error">' . $errmsg_username . '</p>';
277277
}
278278
?>
279-
<input name="user_name" type="text" id="user_name" value="<?php echo esc_attr( $user_name ); ?>" autocapitalize="none" autocorrect="off" maxlength="60" autocomplete="username" aria-describedby="<?php echo $errmsg_username_aria; ?>wp-signup-username-description" />
279+
<input name="user_name" type="text" id="user_name" value="<?php echo esc_attr( $user_name ); ?>" autocapitalize="none" autocorrect="off" maxlength="60" autocomplete="username" required="required" aria-describedby="<?php echo $errmsg_username_aria; ?>wp-signup-username-description" />
280280
<p id="wp-signup-username-description"><?php _e( '(Must be at least 4 characters, lowercase letters and numbers only.)' ); ?></p>
281281

282282
<?php
@@ -289,7 +289,7 @@ function show_user_form( $user_name = '', $user_email = '', $errors = '' ) {
289289
echo '<p class="error" id="wp-signup-email-error">' . $errmsg_email . '</p>';
290290
}
291291
?>
292-
<input name="user_email" type="email" id="user_email" value="<?php echo esc_attr( $user_email ); ?>" maxlength="200" autocomplete="email" aria-describedby="<?php echo $errmsg_email_aria; ?>wp-signup-email-description" />
292+
<input name="user_email" type="email" id="user_email" value="<?php echo esc_attr( $user_email ); ?>" maxlength="200" autocomplete="email" required="required" aria-describedby="<?php echo $errmsg_email_aria; ?>wp-signup-email-description" />
293293
<p id="wp-signup-email-description"><?php _e( 'Your registration email is sent to this address. (Double-check your email address before continuing.)' ); ?></p>
294294

295295
<?php

0 commit comments

Comments
 (0)