Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check if auto-suspend is enabled before setting threshold #4341

Merged
merged 11 commits into from
May 14, 2024
Merged

Check if auto-suspend is enabled before setting threshold #4341

Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1029f28
Check if auto-suspend is enabled before setting threshold
rajinsharwar2 Mar 21, 2024
4522a1e
Log fix
rajinsharwar2 Mar 25, 2024
8dfc822
Update src/bp-moderation/classes/class-bp-moderation.php
rajinsharwar2 Apr 4, 2024
4d43a08
Merge branch 'release' into PROD-7154
jitendrabanjara1991 Apr 17, 2024
3961a64
PROD-7154 - Check if $user_threshold is not empty
rajinsharwar2 Apr 19, 2024
77c1e2c
PROD-7154 - Fix issues with not selecting suspend on block
rajinsharwar2 Apr 24, 2024
7794f0d
PROD-7154 - Update if statement
rajinsharwar2 Apr 27, 2024
39965b8
PROD-7154 - Update if statement code
rajinsharwar2 Apr 27, 2024
396c626
PROD-7154 - Remove error logging
rajinsharwar2 Apr 27, 2024
179bf69
Merge branch 'release' into PROD-7154
jitendrabanjara1991 Apr 29, 2024
588f435
Merge branch 'release' into PROD-7154
KartikSuthar May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/bp-moderation/classes/class-bp-moderation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,8 +1098,8 @@ public function save() {
$auto_hide = false;

if ( BP_Moderation_Members::$moderation_type === $this->item_type && ( bp_is_moderation_auto_suspend_enable() || bb_is_moderation_auto_suspend_report_enable() ) ) {
$threshold = bp_moderation_auto_suspend_threshold( 5 );
$user_threshold = bb_moderation_auto_suspend_report_threshold();
$threshold = bp_is_moderation_auto_suspend_enable() && bp_moderation_auto_suspend_threshold( 5 );
$user_threshold = bb_is_moderation_auto_suspend_report_enable() ? bb_moderation_auto_suspend_report_threshold() : false;
$email_notification = bp_is_moderation_blocking_email_notification_enable();
} elseif ( bp_is_moderation_auto_hide_enable( false, $this->item_type ) ) {
$threshold = bp_moderation_reporting_auto_hide_threshold( '5', $this->item_type );
Expand Down Expand Up @@ -1133,7 +1133,7 @@ public function save() {
$this->hide_sitewide = 1;
$auto_hide = true;
}
if ( BP_Moderation_Members::$moderation_type === $this->item_type && $this->count_report >= $user_threshold && empty( $this->hide_sitewide ) ) {
if ( BP_Moderation_Members::$moderation_type === $this->item_type && ( ! empty( $user_threshold ) && $this->count_report >= $user_threshold ) && empty( $this->hide_sitewide ) ) {
$this->hide_sitewide = 1;
$auto_hide = true;
}
Expand Down