X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fa11948979fd6a4ea5705dc613b239699a459db3..607b7e02d77e7326161e8ec15639052d2040f745:/wp-login.php diff --git a/wp-login.php b/wp-login.php index 042f29a8..01c754f0 100644 --- a/wp-login.php +++ b/wp-login.php @@ -25,13 +25,13 @@ if ( force_ssl_admin() && ! is_ssl() ) { /** * Output the login page header. * - * @param string $title Optional. WordPress Log In Page title to display in element. Default 'Log In'. - * @param string $message Optional. Message to display in header. Default empty. - * @param string $wp_error Optional. The error to pass. Default empty. - * @param WP_Error $wp_error Optional. WordPress Error Object + * @param string $title Optional. WordPress login Page title to display in the `<title>` element. + * Default 'Log In'. + * @param string $message Optional. Message to display in header. Default empty. + * @param WP_Error $wp_error Optional. The error to pass. Default empty. */ -function login_header($title = 'Log In', $message = '', $wp_error = '') { - global $error, $interim_login, $current_site, $action; +function login_header( $title = 'Log In', $message = '', $wp_error = '' ) { + global $error, $interim_login, $action; // Don't index any of these forms add_action( 'login_head', 'wp_no_robots' ); @@ -45,7 +45,7 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') { // Shake it! $shake_error_codes = array( 'empty_password', 'empty_email', 'invalid_email', 'invalidcombo', 'empty_username', 'invalid_username', 'incorrect_password' ); /** - * Filter the error codes array for shaking the login form. + * Filters the error codes array for shaking the login form. * * @since 3.0.0 * @@ -56,19 +56,27 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') { if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) add_action( 'login_head', 'wp_shake_js', 12 ); + $separator = is_rtl() ? ' › ' : ' ‹ '; + ?><!DOCTYPE html> - <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> + <!--[if IE 8]> + <html xmlns="http://www.w3.org/1999/xhtml" class="ie8" <?php language_attributes(); ?>> + <![endif]--> + <!--[if !(IE 8) ]><!--> + <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> + <!--<![endif]--> <head> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" /> - <title><?php bloginfo('name'); ?> › <?php echo $title; ?> + <?php echo get_bloginfo( 'name', 'display' ) . $separator . $title; ?> get_error_code() ) { ?> @@ -81,6 +89,7 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') { * @since 3.1.0 */ do_action( 'login_enqueue_scripts' ); + /** * Fires in the login page header after scripts are enqueued. * @@ -90,22 +99,23 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') { if ( is_multisite() ) { $login_header_url = network_home_url(); - $login_header_title = $current_site->site_name; + $login_header_title = get_current_site()->site_name; } else { - $login_header_url = __( 'http://wordpress.org/' ); + $login_header_url = __( 'https://wordpress.org/' ); $login_header_title = __( 'Powered by WordPress' ); } /** - * Filter link URL of the header logo above login form. + * Filters link URL of the header logo above login form. * * @since 2.1.0 * * @param string $login_header_url Login header logo URL. */ $login_header_url = apply_filters( 'login_headerurl', $login_header_url ); + /** - * Filter the title attribute of the header logo above login form. + * Filters the title attribute of the header logo above login form. * * @since 2.1.0 * @@ -127,9 +137,10 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') { if ( 'success' === $interim_login ) $classes[] = 'interim-login-success'; } + $classes[] =' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) ); /** - * Filter the login page body classes. + * Filters the login page body classes. * * @since 3.5.0 * @@ -141,14 +152,22 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') { ?> +
-

+

get_error_codes() as $code ) { - $severity = $wp_error->get_error_data($code); - foreach ( $wp_error->get_error_messages($code) as $error ) { + $severity = $wp_error->get_error_data( $code ); + foreach ( $wp_error->get_error_messages( $code ) as $error_message ) { if ( 'message' == $severity ) - $messages .= ' ' . $error . "
\n"; + $messages .= ' ' . $error_message . "
\n"; else - $errors .= ' ' . $error . "
\n"; + $errors .= ' ' . $error_message . "
\n"; } } if ( ! empty( $errors ) ) { /** - * Filter the error messages displayed above the login form. + * Filters the error messages displayed above the login form. * * @since 2.1.0 * @@ -188,7 +207,7 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') { } if ( ! empty( $messages ) ) { /** - * Filter instructional messages displayed above the login form. + * Filters instructional messages displayed above the login form. * * @since 2.5.0 * @@ -209,7 +228,10 @@ function login_footer($input_id = '') { // Don't allow interim logins to navigate away from the page. if ( ! $interim_login ): ?> -

+

@@ -234,6 +256,9 @@ function login_footer($input_id = '') { @@ -257,19 +285,20 @@ function wp_login_viewport_meta() { /** * Handles sending password retrieval email to user. * - * @uses $wpdb WordPress Database object + * @global wpdb $wpdb WordPress database abstraction object. + * @global PasswordHash $wp_hasher Portable PHP password hashing framework. * * @return bool|WP_Error True: when finish. WP_Error on error */ function retrieve_password() { - global $wpdb, $current_site, $wp_hasher; + global $wpdb, $wp_hasher; $errors = new WP_Error(); if ( empty( $_POST['user_login'] ) ) { - $errors->add('empty_username', __('ERROR: Enter a username or e-mail address.')); - } else if ( strpos( $_POST['user_login'], '@' ) ) { - $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) ); + $errors->add('empty_username', __('ERROR: Enter a username or email address.')); + } elseif ( strpos( $_POST['user_login'], '@' ) ) { + $user_data = get_user_by( 'email', trim( wp_unslash( $_POST['user_login'] ) ) ); if ( empty( $user_data ) ) $errors->add('invalid_email', __('ERROR: There is no user registered with that email address.')); } else { @@ -281,76 +310,31 @@ function retrieve_password() { * Fires before errors are returned from a password reset request. * * @since 2.1.0 + * @since 4.4.0 Added the `$errors` parameter. + * + * @param WP_Error $errors A WP_Error object containing any errors generated + * by using invalid credentials. */ - do_action( 'lostpassword_post' ); + do_action( 'lostpassword_post', $errors ); if ( $errors->get_error_code() ) return $errors; if ( !$user_data ) { - $errors->add('invalidcombo', __('ERROR: Invalid username or e-mail.')); + $errors->add('invalidcombo', __('ERROR: Invalid username or email.')); return $errors; } - // redefining user_login ensures we return the right case in the email + // Redefining user_login ensures we return the right case in the email. $user_login = $user_data->user_login; $user_email = $user_data->user_email; + $key = get_password_reset_key( $user_data ); - /** - * Fires before a new password is retrieved. - * - * @since 1.5.2 - * @deprecated 1.5.2 Misspelled. Use 'retrieve_password' hook instead. - * - * @param string $user_login The user login name. - */ - do_action( 'retreive_password', $user_login ); - /** - * Fires before a new password is retrieved. - * - * @since 1.5.2 - * - * @param string $user_login The user login name. - */ - do_action( 'retrieve_password', $user_login ); - - /** - * Filter whether to allow a password to be reset. - * - * @since 2.7.0 - * - * @param bool true Whether to allow the password to be reset. Default true. - * @param int $user_data->ID The ID of the user attempting to reset a password. - */ - $allow = apply_filters( 'allow_password_reset', true, $user_data->ID ); - - if ( ! $allow ) - return new WP_Error('no_password_reset', __('Password reset is not allowed for this user')); - else if ( is_wp_error($allow) ) - return $allow; - - // Generate something random for a password reset key. - $key = wp_generate_password( 20, false ); - - /** - * Fires when a password reset key is generated. - * - * @since 2.5.0 - * - * @param string $user_login The username for the user. - * @param string $key The generated password reset key. - */ - do_action( 'retrieve_password_key', $user_login, $key ); - - // Now insert the key, hashed, into the DB. - if ( empty( $wp_hasher ) ) { - require_once ABSPATH . 'wp-includes/class-phpass.php'; - $wp_hasher = new PasswordHash( 8, true ); + if ( is_wp_error( $key ) ) { + return $key; } - $hashed = $wp_hasher->HashPassword( $key ); - $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user_login ) ); - $message = __('Someone requested that the password be reset for the following account:') . "\r\n\r\n"; + $message = __('Someone has requested a password reset for the following account:') . "\r\n\r\n"; $message .= network_home_url( '/' ) . "\r\n\r\n"; $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; $message .= __('If this was a mistake, just ignore this email and nothing will happen.') . "\r\n\r\n"; @@ -360,32 +344,41 @@ function retrieve_password() { if ( is_multisite() ) $blogname = $GLOBALS['current_site']->site_name; else - // The blogname option is escaped with esc_html on the way into the database in sanitize_option - // we want to reverse this for the plain text arena of emails. + /* + * The blogname option is escaped with esc_html on the way into the database + * in sanitize_option we want to reverse this for the plain text arena of emails. + */ $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); $title = sprintf( __('[%s] Password Reset'), $blogname ); /** - * Filter the subject of the password reset email. + * Filters the subject of the password reset email. * * @since 2.8.0 + * @since 4.4.0 Added the `$user_login` and `$user_data` parameters. * - * @param string $title Default email title. + * @param string $title Default email title. + * @param string $user_login The username for the user. + * @param WP_User $user_data WP_User object. */ - $title = apply_filters( 'retrieve_password_title', $title ); + $title = apply_filters( 'retrieve_password_title', $title, $user_login, $user_data ); + /** - * Filter the message body of the password reset mail. + * Filters the message body of the password reset mail. * * @since 2.8.0 + * @since 4.1.0 Added `$user_login` and `$user_data` parameters. * - * @param string $message Default mail message. - * @param string $key The activation key. + * @param string $message Default mail message. + * @param string $key The activation key. + * @param string $user_login The username for the user. + * @param WP_User $user_data WP_User object. */ - $message = apply_filters( 'retrieve_password_message', $message, $key ); + $message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data ); - if ( $message && !wp_mail($user_email, $title, $message) ) - wp_die( __('The e-mail could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function.') ); + if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) ) + wp_die( __('The email could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function.') ); return true; } @@ -418,9 +411,10 @@ if ( defined( 'RELOCATE' ) && RELOCATE ) { // Move flag is set } //Set a cookie now to see if they are supported by the browser. -setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN); +$secure = ( 'https' === parse_url( wp_login_url(), PHP_URL_SCHEME ) ); +setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure ); if ( SITECOOKIEPATH != COOKIEPATH ) - setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN); + setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure ); /** * Fires when the login form is initialized. @@ -431,7 +425,7 @@ do_action( 'login_init' ); /** * Fires before a specified login form action. * - * The dynamic portion of the hook name, $action, refers to the action + * The dynamic portion of the hook name, `$action`, refers to the action * that brought the visitor to the login form. Actions include 'postpass', * 'logout', 'lostpassword', etc. * @@ -445,11 +439,16 @@ $interim_login = isset($_REQUEST['interim-login']); switch ($action) { case 'postpass' : - require_once ABSPATH . 'wp-includes/class-phpass.php'; + if ( ! array_key_exists( 'post_password', $_POST ) ) { + wp_safe_redirect( wp_get_referer() ); + exit(); + } + + require_once ABSPATH . WPINC . '/class-phpass.php'; $hasher = new PasswordHash( 8, true ); /** - * Filter the life span of the post password cookie. + * Filters the life span of the post password cookie. * * By default, the cookie expires 10 days from creation. To turn this * into a session cookie, return 0. @@ -459,23 +458,44 @@ case 'postpass' : * @param int $expires The expiry time, as passed to setcookie(). */ $expire = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS ); - setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH ); + $referer = wp_get_referer(); + if ( $referer ) { + $secure = ( 'https' === parse_url( $referer, PHP_URL_SCHEME ) ); + } else { + $secure = false; + } + setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure ); wp_safe_redirect( wp_get_referer() ); exit(); -break; - case 'logout' : check_admin_referer('log-out'); + + $user = wp_get_current_user(); + wp_logout(); - $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?loggedout=true'; + if ( ! empty( $_REQUEST['redirect_to'] ) ) { + $redirect_to = $requested_redirect_to = $_REQUEST['redirect_to']; + } else { + $redirect_to = 'wp-login.php?loggedout=true'; + $requested_redirect_to = ''; + } + + /** + * Filters the log out redirect URL. + * + * @since 4.2.0 + * + * @param string $redirect_to The redirect destination URL. + * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter. + * @param WP_User $user The WP_User object for the user that's logging out. + */ + $redirect_to = apply_filters( 'logout_redirect', $redirect_to, $requested_redirect_to, $user ); wp_safe_redirect( $redirect_to ); exit(); -break; - case 'lostpassword' : case 'retrievepassword' : @@ -489,15 +509,16 @@ case 'retrievepassword' : } if ( isset( $_GET['error'] ) ) { - if ( 'invalidkey' == $_GET['error'] ) - $errors->add( 'invalidkey', __( 'Sorry, that key does not appear to be valid.' ) ); - elseif ( 'expiredkey' == $_GET['error'] ) - $errors->add( 'expiredkey', __( 'Sorry, that key has expired. Please try again.' ) ); + if ( 'invalidkey' == $_GET['error'] ) { + $errors->add( 'invalidkey', __( 'Your password reset link appears to be invalid. Please request a new link below.' ) ); + } elseif ( 'expiredkey' == $_GET['error'] ) { + $errors->add( 'expiredkey', __( 'Your password reset link has expired. Please request a new link below.' ) ); + } } $lostpassword_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : ''; /** - * Filter the URL redirected to after submitting the lostpassword/retrievepassword form. + * Filters the URL redirected to after submitting the lostpassword/retrievepassword form. * * @since 3.0.0 * @@ -508,7 +529,7 @@ case 'retrievepassword' : /** * Fires before the lost password form. * - * @since 1.5.2 + * @since 1.5.1 */ do_action( 'lost_password' ); @@ -518,14 +539,14 @@ case 'retrievepassword' : ?> -
+

-

tags, before the hidden fields. + * Fires inside the lostpassword form tags, before the hidden fields. * * @since 2.1.0 */ @@ -539,13 +560,8 @@ case 'retrievepassword' : %s', esc_url( wp_registration_url() ), __( 'Register' ) ); - /** - * Filter the registration URL below the login form. - * - * @since 1.5.2 - * - * @param string $registration_url Registration URL. - */ + + /** This filter is documented in wp-includes/general-template.php */ echo ' | ' . apply_filters( 'register', $registration_url ); endif; ?> @@ -557,10 +573,28 @@ break; case 'resetpass' : case 'rp' : - $user = check_password_reset_key($_GET['key'], $_GET['login']); + list( $rp_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) ); + $rp_cookie = 'wp-resetpass-' . COOKIEHASH; + if ( isset( $_GET['key'] ) ) { + $value = sprintf( '%s:%s', wp_unslash( $_GET['login'] ), wp_unslash( $_GET['key'] ) ); + setcookie( $rp_cookie, $value, 0, $rp_path, COOKIE_DOMAIN, is_ssl(), true ); + wp_safe_redirect( remove_query_arg( array( 'key', 'login' ) ) ); + exit; + } + + if ( isset( $_COOKIE[ $rp_cookie ] ) && 0 < strpos( $_COOKIE[ $rp_cookie ], ':' ) ) { + list( $rp_login, $rp_key ) = explode( ':', wp_unslash( $_COOKIE[ $rp_cookie ] ), 2 ); + $user = check_password_reset_key( $rp_key, $rp_login ); + if ( isset( $_POST['pass1'] ) && ! hash_equals( $rp_key, $_POST['rp_key'] ) ) { + $user = false; + } + } else { + $user = false; + } - if ( is_wp_error($user) ) { - if ( $user->get_error_code() === 'expired_key' ) + if ( ! $user || is_wp_error( $user ) ) { + setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true ); + if ( $user && $user->get_error_code() === 'expired_key' ) wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=expiredkey' ) ); else wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=invalidkey' ) ); @@ -584,6 +618,7 @@ case 'rp' : if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && !empty( $_POST['pass1'] ) ) { reset_password($user, $_POST['pass1']); + setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true ); login_header( __( 'Password Reset' ), '

' . __( 'Your password has been reset.' ) . ' ' . __( 'Log in' ) . '

' ); login_footer(); exit; @@ -595,22 +630,41 @@ case 'rp' : login_header(__('Reset Password'), '

' . __('Enter your new password below.') . '

', $errors ); ?> - - + + + +
+

+ +

+ +
+ + + +
+
+
-

- -

-

- +

+
+

-
-

- +


+ + +

@@ -619,7 +673,8 @@ case 'rp' : %s', esc_url( wp_registration_url() ), __( 'Register' ) ); - /** This filter is documented in wp-login.php */ + + /** This filter is documented in wp-includes/general-template.php */ echo ' | ' . apply_filters( 'register', $registration_url ); endif; ?> @@ -631,15 +686,14 @@ break; case 'register' : if ( is_multisite() ) { - $sign_up_url = network_site_url( 'wp-signup.php' ); /** - * Filter the Multisite sign up URL. + * Filters the Multisite sign up URL. * * @since 3.0.0 * * @param string $sign_up_url The sign up URL. */ - wp_redirect( apply_filters( 'wp_signup_location', $sign_up_url ) ); + wp_redirect( apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ) ); exit; } @@ -651,8 +705,8 @@ case 'register' : $user_login = ''; $user_email = ''; if ( $http_post ) { - $user_login = $_POST['user_login']; - $user_email = $_POST['user_email']; + $user_login = isset( $_POST['user_login'] ) ? $_POST['user_login'] : ''; + $user_email = isset( $_POST['user_email'] ) ? $_POST['user_email'] : ''; $errors = register_new_user($user_login, $user_email); if ( !is_wp_error($errors) ) { $redirect_to = !empty( $_POST['redirect_to'] ) ? $_POST['redirect_to'] : 'wp-login.php?checkemail=registered'; @@ -663,7 +717,7 @@ case 'register' : $registration_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : ''; /** - * Filter the registration redirect URL. + * Filters the registration redirect URL. * * @since 3.0.0 * @@ -672,25 +726,24 @@ case 'register' : $redirect_to = apply_filters( 'registration_redirect', $registration_redirect ); login_header(__('Registration Form'), '

' . __('Register For This Site') . '

', $errors); ?> - -
+

- +

-

+


@@ -698,7 +751,7 @@ case 'register' : ID) ) { $secure_cookie = true; force_ssl_admin(true); @@ -734,21 +793,22 @@ default: $reauth = empty($_REQUEST['reauth']) ? false : true; - // If the user was redirected to a secure login form from a non-secure admin page, and secure login is required but secure admin is not, then don't use a secure - // cookie and redirect back to the referring non-secure admin page. This allows logins to always be POSTed over SSL while allowing the user to choose visiting - // the admin via http or https. - if ( !$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) ) - $secure_cookie = false; + $user = wp_signon( array(), $secure_cookie ); - // If cookies are disabled we can't log in even with a valid user+pass - if ( isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]) ) - $user = new WP_Error('test_cookie', __("ERROR: Cookies are blocked or not supported by your browser. You must enable cookies to use WordPress.")); - else - $user = wp_signon('', $secure_cookie); + if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) { + if ( headers_sent() ) { + $user = new WP_Error( 'test_cookie', sprintf( __( 'ERROR: Cookies are blocked due to unexpected output. For help, please see this documentation or try the support forums.' ), + __( 'https://codex.wordpress.org/Cookies' ), __( 'https://wordpress.org/support/' ) ) ); + } elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) { + // If cookies are disabled we can't log in even with a valid user+pass + $user = new WP_Error( 'test_cookie', sprintf( __( 'ERROR: Cookies are blocked or not supported by your browser. You must enable cookies to use WordPress.' ), + __( 'https://codex.wordpress.org/Cookies' ) ) ); + } + } $requested_redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : ''; /** - * Filter the login redirect URL. + * Filters the login redirect URL. * * @since 3.0.0 * @@ -781,7 +841,10 @@ default: elseif ( is_multisite() && !$user->has_cap('read') ) $redirect_to = get_dashboard_url( $user->ID ); elseif ( !$user->has_cap('edit_posts') ) - $redirect_to = admin_url('profile.php'); + $redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url(); + + wp_redirect( $redirect_to ); + exit(); } wp_safe_redirect($redirect_to); exit(); @@ -794,7 +857,7 @@ default: if ( $interim_login ) { if ( ! $errors->get_error_code() ) - $errors->add('expired', __('Session expired. Please log in again. You will not move away from this page.'), 'message'); + $errors->add( 'expired', __( 'Your session has expired. Please log in to continue where you left off.' ), 'message' ); } else { // Some parts of this script use the main login form to display a message if ( isset($_GET['loggedout']) && true == $_GET['loggedout'] ) @@ -802,17 +865,17 @@ default: elseif ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] ) $errors->add('registerdisabled', __('User registration is currently not allowed.')); elseif ( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] ) - $errors->add('confirm', __('Check your e-mail for the confirmation link.'), 'message'); + $errors->add('confirm', __('Check your email for the confirmation link.'), 'message'); elseif ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] ) - $errors->add('newpass', __('Check your e-mail for your new password.'), 'message'); + $errors->add('newpass', __('Check your email for your new password.'), 'message'); elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] ) - $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message'); + $errors->add('registered', __('Registration complete. Please check your email.'), 'message'); elseif ( strpos( $redirect_to, 'about.php?updated' ) ) - $errors->add('updated', __( 'You have successfully updated WordPress! Please log back in to experience the awesomeness.' ), 'message' ); + $errors->add('updated', __( 'You have successfully updated WordPress! Please log back in to see what’s new.' ), 'message' ); } /** - * Filter the login page errors. + * Filters the login page errors. * * @since 3.6.0 * @@ -830,16 +893,22 @@ default: if ( isset($_POST['log']) ) $user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(wp_unslash($_POST['log'])) : ''; $rememberme = ! empty( $_POST['rememberme'] ); + + if ( ! empty( $errors->errors ) ) { + $aria_describedby_error = ' aria-describedby="login_error"'; + } else { + $aria_describedby_error = ''; + } ?>

- +

+ class="input" value="" size="20" />

%s', esc_url( wp_registration_url() ), __( 'Register' ) ); - /** This filter is documented in wp-login.php */ + + /** This filter is documented in wp-includes/general-template.php */ echo apply_filters( 'register', $registration_url ) . ' | '; endif; ?> - +

@@ -881,7 +951,7 @@ default: