From b9b19ee1c35cf7aa0cd32f933d2adf11cf762302 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Tue, 24 Aug 2021 16:44:05 +0200 Subject: [PATCH] Exclude banned users from list of users awaiting approval --- .../install/files/lib/acp/action/UserQuickSearchAction.class.php | 1 + wcfsetup/install/files/lib/acp/page/IndexPage.class.php | 1 + 2 files changed, 2 insertions(+) diff --git a/wcfsetup/install/files/lib/acp/action/UserQuickSearchAction.class.php b/wcfsetup/install/files/lib/acp/action/UserQuickSearchAction.class.php index 58a0beedc5..27dc6e2dbe 100644 --- a/wcfsetup/install/files/lib/acp/action/UserQuickSearchAction.class.php +++ b/wcfsetup/install/files/lib/acp/action/UserQuickSearchAction.class.php @@ -137,6 +137,7 @@ class UserQuickSearchAction extends AbstractAction case 'pendingActivation': $conditionBuilder = new PreparedStatementConditionBuilder(); + $conditionBuilder->add('banned = ?', [0]); $conditionBuilder->add('activationCode <> ?', [0]); if (REGISTER_ACTIVATION_METHOD & User::REGISTER_ACTIVATION_USER) { $conditionBuilder->add('emailConfirmed IS NULL'); diff --git a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php index 5cce1caa9f..29ba79aa5b 100755 --- a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php @@ -83,6 +83,7 @@ class IndexPage extends AbstractPage $usersAwaitingApproval = 0; if (REGISTER_ACTIVATION_METHOD & User::REGISTER_ACTIVATION_ADMIN) { $conditionBuilder = new PreparedStatementConditionBuilder(); + $conditionBuilder->add('banned = ?', [0]); $conditionBuilder->add('activationCode <> ?', [0]); if (REGISTER_ACTIVATION_METHOD & User::REGISTER_ACTIVATION_USER) { $conditionBuilder->add('emailConfirmed IS NULL'); -- 2.20.1