Changeset 43458

Timestamp:

07/16/2018 02:13:11 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Login and Registration: Set a better default value for $wp_error parameter in login_header().

To prevent someone from passing a string (which would not be added to a new WP_Error instance), check for is_wp_error() explicitly.

Props desrosj, chetan200891, spyderbytes, lbenicio, sebastien@…, abdullahramzan.
Merges [43457] to the 4.9 branch.
Fixes #44052.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-login.php (modified) (2 diffs)

branches/4.9/src/wp-login.php

@@ -29 +29 @@
  *                           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 WP_Error $wp_error Optional. The error to pass. Default is a WP_Error instance.
  */
-function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
+function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
     global $error, $interim_login, $action;
 
@@ -39 +39 @@
     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!