X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/138998bbd8f7a1ac38b2f1eacbdf7cd522be4b13..8d3bb1a5dcfdea9857d3c88c3751f09593e34dc8:/wp-login.php diff --git a/wp-login.php b/wp-login.php index ea3afc6c..01c754f0 100644 --- a/wp-login.php +++ b/wp-login.php @@ -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,6 +56,8 @@ 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() ? ' › ' : ' ‹ '; + ?> - <?php bloginfo('name'); ?> › <?php echo $title; ?> + <?php echo get_bloginfo( 'name', 'display' ) . $separator . $title; ?> +

-

+

@@ -283,7 +298,7 @@ function retrieve_password() { if ( empty( $_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( $_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 { @@ -338,7 +353,7 @@ function retrieve_password() { $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. @@ -350,7 +365,7 @@ function retrieve_password() { $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. @@ -433,7 +448,7 @@ case 'postpass' : $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. @@ -469,7 +484,7 @@ case 'logout' : } /** - * Filter the log out redirect URL. + * Filters the log out redirect URL. * * @since 4.2.0 * @@ -503,7 +518,7 @@ case 'retrievepassword' : $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 * @@ -526,7 +541,7 @@ case 'retrievepassword' :

-

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

', $errors); ?> - - +

@@ -737,7 +751,7 @@ case 'register' :

ID) ) { $secure_cookie = true; force_ssl_admin(true); @@ -773,7 +793,7 @@ default: $reauth = empty($_REQUEST['reauth']) ? false : true; - $user = wp_signon( '', $secure_cookie ); + $user = wp_signon( array(), $secure_cookie ); if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) { if ( headers_sent() ) { @@ -788,7 +808,7 @@ default: $requested_redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : ''; /** - * Filter the login redirect URL. + * Filters the login redirect URL. * * @since 3.0.0 * @@ -822,6 +842,9 @@ default: $redirect_to = get_dashboard_url( $user->ID ); elseif ( !$user->has_cap('edit_posts') ) $redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url(); + + wp_redirect( $redirect_to ); + exit(); } wp_safe_redirect($redirect_to); exit(); @@ -834,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'] ) @@ -852,7 +875,7 @@ default: } /** - * Filter the login page errors. + * Filters the login page errors. * * @since 3.6.0 * @@ -878,9 +901,9 @@ default: } ?> - +

-

@@ -920,7 +943,7 @@ default: echo apply_filters( 'register', $registration_url ) . ' | '; endif; ?> - +