Changeset 10463 for trunk/wp-includes/user.php

Timestamp:

01/29/2009 09:30:16 PM (16 years ago)

Author:

westi

Message:

Much better handling of wp-login.php page load. See #8938 props wnorris.

File:

• trunk/wp-includes/user.php (modified) (2 diffs)

trunk/wp-includes/user.php

@@ -51 +51 @@
     $user = wp_authenticate($credentials['user_login'], $credentials['user_password']);
 
-    if ( is_wp_error($user) )
+    if ( is_wp_error($user) ) {
+        if ( $user->get_error_codes() == array('empty_username', 'empty_password') ) {
+            $user = new WP_Error('', '');
+        }
+
         return $user;
+    }
 
     wp_set_auth_cookie($user->ID, $credentials['remember'], $secure_cookie);
@@ -66 +71 @@
 function wp_authenticate_username_password($user, $username, $password) {
     if ( is_a($user, 'WP_User') ) { return $user; }
-
-    // TODO slight hack to handle initial load of wp-login.php
-    if ( (empty($username) && empty($password)) && $GLOBALS['pagenow'] == 'wp-login.php' ) {
-        return $user;
-    }
 
     if ( empty($username) || empty($password) ) {