Ticket #6123: 6123.02.diff

src/bp-core/bp-core-catchuri.php

@@ -269 +269 @@
                                         return;
                                 }
 
-                                // If the displayed user is marked as a spammer, 404 (unless logged-
-                                // in user is a super admin)
-                                if ( bp_displayed_user_id() && bp_is_user_spammer( bp_displayed_user_id() ) ) {
-                                        if ( bp_current_user_can( 'bp_moderate' ) ) {
-                                                bp_core_add_message( __( 'This user has been marked as a spammer. Only site admins can view this profile.', 'buddypress' ), 'warning' );
-                                        } else {
+                                // If the displayed user is marked as a spammer, the account is not active or user is deleted, 404
+                                // (unless logged-in user is a super admin if the user is marked as spammer)
+                                if ( bp_displayed_user_id() ) {
+
+                                        // Do not display a "not activated" signup or deleted user as a member
+                                        if ( bp_is_user_deleted( bp_displayed_user_id() ) ) {
                                                 bp_do_404();
                                                 return;
                                         }
+
+                                        // Only display spammer if the user is a super admin
+                                        if ( bp_is_user_spammer( bp_displayed_user_id() ) ) {
+                                                if ( bp_current_user_can( 'bp_moderate' ) ) {
+                                                        bp_core_add_message( __( 'This user has been marked as a spammer. Only site admins can view this profile.', 'buddypress' ), 'warning' );
+                                                } else {
+                                                        bp_do_404();
+                                                        return;
+                                                }
+                                        }
                                 }
 
                                 // Bump the offset

src/bp-members/bp-members-loader.php

@@ -199 +199 @@
                         // users without the cap trying to access a spammer's subnav page will get
                         // redirected to the root of the spammer's profile page.  this occurs by
                         // by removing the component in the canonical stack.
-                        if ( bp_is_user_spammer( bp_displayed_user_id() ) && ! bp_current_user_can( 'bp_moderate' ) ) {
+                        if ( ( bp_is_user_spammer( bp_displayed_user_id() ) && ! bp_current_user_can( 'bp_moderate' ) ) || bp_is_user_deleted( bp_displayed_user_id() ) ) {
                                 unset( $bp->canonical_stack['component'] );
                         }
                 }