golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Integrate login_spam_check() into wp_authenticate_username_password(). see #11644 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12853 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-01-26 20:25:34 +00:00
parent 9b79d3d516
commit ab33443daf
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/ms-functions.php
View File

@ -1887,13 +1887,6 @@ function is_user_spammy( $username = 0 ) {
return false;
}
function login_spam_check( $user, $password ) {
if ( is_user_spammy( $user->ID ) )
return new WP_Error('invalid_username', __('<strong>ERROR</strong>: your account has been marked as a spammer.'));
return $user;
}
add_action( 'wp_authenticate_user', 'login_spam_check', 10, 2 );
function update_blog_public( $old_value, $value ) {
global $wpdb;
do_action('update_blog_public');

14
wp-includes/user.php
View File

@ -83,20 +83,20 @@ function wp_authenticate_username_password($user, $username, $password) {
return $error;
}
$userdata = get_userdatabylogin($username);
$userdata = get_user_by('login', $username);
if ( !$userdata ) {
if ( !$userdata )
return new WP_Error('invalid_username', sprintf(__('<strong>ERROR</strong>: Invalid username. <a href="%s" title="Password Lost and Found">Lost your password</a>?'), site_url('wp-login.php?action=lostpassword', 'login')));
}
if ( is_multisite() && (1 == $userdata->spam) )
return new WP_Error('invalid_username', __('<strong>ERROR</strong>: Your account has been marked as a spammer.'));
$userdata = apply_filters('wp_authenticate_user', $userdata, $password);
if ( is_wp_error($userdata) ) {
if ( is_wp_error($userdata) )
return $userdata;
}
if ( !wp_check_password($password, $userdata->user_pass, $userdata->ID) ) {
if ( !wp_check_password($password, $userdata->user_pass, $userdata->ID) )
return new WP_Error('incorrect_password', sprintf(__('<strong>ERROR</strong>: Incorrect password. <a href="%s" title="Password Lost and Found">Lost your password</a>?'), site_url('wp-login.php?action=lostpassword', 'login')));
}
$user = new WP_User($userdata->ID);
return $user;