Ticket #24771: 24771.diff

user.php

@@ -95 +95 @@
                         return new WP_Error( 'spammer_account', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.' ) );
 
                 // Is a user's blog marked as spam?
-                if ( !is_super_admin( $user->ID ) && isset( $user->primary_blog ) ) {
+                if ( !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 )
                                 return new WP_Error( 'blog_suspended', __( 'Site Suspended.' ) );