Changeset 10455

Timestamp:

01/28/2009 10:11:49 PM (16 years ago)

Author:

westi

Message:

Don't show the error on normal login page loads. See #8938.

Location:

trunk/wp-includes

Files:

• pluggable.php (modified) (1 diff)
• user.php (modified) (1 diff)

trunk/wp-includes/pluggable.php

@@ -427 +427 @@
     $user = apply_filters('authenticate', null, $username, $password);
 
-    if ($user == null) {
+    if ( ($user == null ) ) {
+        // TODO slight hack to handle initial load of wp-login.php
+        if ( empty($username) && empty($password) && ($GLOBALS['pagenow'] == 'wp-login.php' ) ) {
+            $user = new WP_Error('',''); //No Error
+        } else {
         // TODO what should the error message be? (Or would these even happen?)
         // Only needed if all authentication handlers fail to return anything.
         $user = new WP_Error('authentication_failed', __('<strong>ERROR</strong>: Invalid username or incorrect password.'));
+        }
     }
 

trunk/wp-includes/user.php

@@ -67 +67 @@
     if ( is_a($user, 'WP_User') ) { return $user; }
 
-    // XXX slight hack to handle initial load of wp-login.php
+    // TODO slight hack to handle initial load of wp-login.php
     if ( (empty($username) && empty($password)) && $GLOBALS['pagenow'] == 'wp-login.php' ) {
         return $user;