Don't show the error on normal login page loads. See #8938.
git-svn-id: https://develop.svn.wordpress.org/trunk@10455 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
d468232b26
commit
0f07c161d7
|
@ -426,11 +426,16 @@ 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', __('<strong>ERROR</strong>: Invalid username or incorrect password.'));
|
||||
}
|
||||
}
|
||||
|
||||
if (is_wp_error($user)) {
|
||||
do_action('wp_login_failed', $username);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue