Changeset 42761 for trunk/src/wp-login.php

Timestamp:

02/27/2018 02:30:46 AM (7 years ago)

Author:

SergeyBiryukov

Message:

General: Introduce WP_Error::has_errors() method and use it where appropriate.

Props robdxw, DrewAPicture, SergeyBiryukov.
Fixes #42742.

File:

• trunk/src/wp-login.php (modified) (6 diffs)

trunk/src/wp-login.php

@@ -54 +54 @@
     $shake_error_codes = apply_filters( 'shake_error_codes', $shake_error_codes );
 
-    if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) {
+    if ( $shake_error_codes && $wp_error->has_errors() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) {
         add_action( 'login_head', 'wp_shake_js', 12 );
     }
@@ -209 +209 @@
     }
 
-    if ( $wp_error->get_error_code() ) {
+    if ( $wp_error->has_errors() ) {
         $errors   = '';
         $messages = '';
@@ -342 +342 @@
     do_action( 'lostpassword_post', $errors );
 
-    if ( $errors->get_error_code() ) {
+    if ( $errors->has_errors() ) {
         return $errors;
     }
@@ -688 +688 @@
         do_action( 'validate_password_reset', $errors, $user );
 
-        if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && ! empty( $_POST['pass1'] ) ) {
+        if ( ( ! $errors->has_errors() ) && 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 );
@@ -974 +974 @@
 
         if ( $interim_login ) {
-            if ( ! $errors->get_error_code() ) {
+            if ( ! $errors->has_errors() ) {
                 $errors->add( 'expired', __( 'Your session has expired. Please log in to continue where you left off.' ), 'message' );
             }
@@ -1016 +1016 @@
         $rememberme = ! empty( $_POST['rememberme'] );
 
-        if ( ! empty( $errors->errors ) ) {
+        if ( $errors->has_errors() ) {
             $aria_describedby_error = ' aria-describedby="login_error"';
         } else {