Changeset 12853

Timestamp:

01/26/2010 08:25:34 PM (15 years ago)

Author:

ryan

Message:

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

Location:

trunk/wp-includes

Files:

• ms-functions.php (modified) (1 diff)
• user.php (modified) (1 diff)

trunk/wp-includes/ms-functions.php

@@ -1888 +1888 @@
 }
 
-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;

trunk/wp-includes/user.php

@@ -84 +84 @@
     }
 
-    $userdata = get_userdatabylogin($username);
-
-    if ( !$userdata ) {
+    $userdata = get_user_by('login', $username);
+
+    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);