Ticket #24771: 24771.2.diff

wp-includes/user.php

@@ -93 +93 @@
                 // Is user marked as spam?
                 if ( 1 == $user->spam )
                         return new WP_Error( 'spammer_account', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.' ) );
+                
+                $wp_authenticate_user_for_blog = apply_filters( 'wp_authenticate_user_for_blog' , false , $user->ID, $user->primary_blog );
 
                 // Is a user's blog marked as spam?
-                if ( !is_super_admin( $user->ID ) && isset( $user->primary_blog ) ) {
+            if ( $wp_authenticate_user_for_blog && ! is_super_admin( $user->ID ) && isset( $user->primary_blog ) && is_user_member_of_blog( $user->ID, $user->primary_blog ) ) { 
                         $details = get_blog_details( $user->primary_blog );
-                        if ( is_object( $details ) && $details->spam == 1 )
+                        if ( is_object( $details ) && $details->spam == 1 )                     
                                 return new WP_Error( 'blog_suspended', __( 'Site Suspended.' ) );
                 }
         }