Exclude banned users from list of users awaiting approval

diff --git a/wcfsetup/install/files/lib/acp/action/UserQuickSearchAction.class.php b/wcfsetup/install/files/lib/acp/action/UserQuickSearchAction.class.php
index 58a0beedc50efee21e1d8c7fb0b3ee73ed3f98f8..27dc6e2dbe42d3ac97f63a2465937ca0d4193a7c 100644 (file)
--- 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 5cce1caa9f986304663541094e2c451a3f45e4e4..29ba79aa5b0045c93c7a44e831e50f7aecf40b32 100755 (executable)
--- 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');