From f02590c92181fd45cd3f8dbd5990097f7c7bdeaf Mon Sep 17 00:00:00 2001 From: westi Date: Wed, 28 Jan 2009 22:11:49 +0000 Subject: [PATCH] Don't show the error on normal login page loads. See #8938. git-svn-id: http://svn.automattic.com/wordpress/trunk@10455 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/pluggable.php | 7 ++++++- wp-includes/user.php | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index ddb746ad0..0028b8cfa 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -426,10 +426,15 @@ function wp_authenticate($username, $password) { $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', __('ERROR: Invalid username or incorrect password.')); + } } if (is_wp_error($user)) { diff --git a/wp-includes/user.php b/wp-includes/user.php index d21d5f54e..3c61ad6ec 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -66,7 +66,7 @@ add_filter('authenticate', 'wp_authenticate_username_password', 20, 3); function wp_authenticate_username_password($user, $username, $password) { 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; }