Ticket #47001: 47001.diff

wp-includes/general-template.php

@@ -459 +459 @@
         $defaults = array(
                 'echo'           => true,
                 // Default 'redirect' value takes the user back to the request URI.
-                'redirect'       => ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'],
-                'form_id'        => 'loginform',
-                'label_username' => __( 'Username or Email Address' ),
-                'label_password' => __( 'Password' ),
-                'label_remember' => __( 'Remember Me' ),
-                'label_log_in'   => __( 'Log In' ),
-                'id_username'    => 'user_login',
-                'id_password'    => 'user_pass',
-                'id_remember'    => 'rememberme',
-                'id_submit'      => 'wp-submit',
-                'remember'       => true,
-                'value_username' => '',
+                'redirect'          => ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'],
+                'form_id'           => 'loginform',
+                'label_username'    => __( 'Username or Email Address' ),
+                'label_password'    => __( 'Password' ),
+                'label_remember'    => __( 'Remember Me' ),
+                'label_log_in'      => __( 'Log In' ),
+                'id_username'       => 'user_login',
+                'id_password'       => 'user_pass',
+                'id_remember'       => 'rememberme',
+                'id_submit'         => 'wp-submit',
+                'remember'          => true,
+                'value_username'    => '',
+                'username_required' => true,
+                'password_required' => true,
                 // Set 'value_remember' to true to default the "Remember me" checkbox to checked.
                 'value_remember' => false,
         );
@@ -528 +530 @@
                         ' . $login_form_top . '
                         <p class="login-username">
                                 <label for="' . esc_attr( $args['id_username'] ) . '">' . esc_html( $args['label_username'] ) . '</label>
-                                <input type="text" name="log" id="' . esc_attr( $args['id_username'] ) . '" class="input" value="' . esc_attr( $args['value_username'] ) . '" size="20" />
+                                <input type="text" name="log" id="' . esc_attr( $args['id_username'] ) . '" class="input" value="' . esc_attr( $args['value_username'] ) . '" size="20"' . ( $args['username_required'] ? ' required="required"' : '' ) . '/>
                         </p>
                         <p class="login-password">
                                 <label for="' . esc_attr( $args['id_password'] ) . '">' . esc_html( $args['label_password'] ) . '</label>
-                                <input type="password" name="pwd" id="' . esc_attr( $args['id_password'] ) . '" class="input" value="" size="20" />
+                                <input type="password" name="pwd" id="' . esc_attr( $args['id_password'] ) . '" class="input" value="" size="20"' . ( $args['password_required'] ? ' required="required"' : '' ) . '/>
                         </p>
                         ' . $login_form_middle . '
                         ' . ( $args['remember'] ? '<p class="login-remember"><label><input name="rememberme" type="checkbox" id="' . esc_attr( $args['id_remember'] ) . '" value="forever"' . ( $args['value_remember'] ? ' checked="checked"' : '' ) . ' /> ' . esc_html( $args['label_remember'] ) . '</label></p>' : '' ) . '