Ticket #44052: 44052.3.2.diff

wp-login.php

@@ -25 +25 @@
 /**
  * Output the login page header.
  *
- * @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.
+ * @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 string|WP_Error  $wp_error Optional. The error to pass. Default null.
  */
-function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
+function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
         global $error, $interim_login, $action;
 
         // Don't index any of these forms
@@ -38 +38 @@
 
         add_action( 'login_head', 'wp_login_viewport_meta' );
 
+        if ( empty( $wp_error ) ) {
         if ( ! is_wp_error( $wp_error ) ) {
                 $wp_error = new WP_Error();
         }
 
+
+
         // Shake it!
         $shake_error_codes = array( 'empty_password', 'empty_email', 'invalid_email', 'invalidcombo', 'empty_username', 'invalid_username', 'incorrect_password' );
         /**