From 6f34eb85958b5fb03b210421c8da129257a6ba0c Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 12 Dec 2014 19:26:24 +0100 Subject: [PATCH] Fixed moderation queue dropdown returning all items --- .../lib/data/moderation/queue/ModerationQueueAction.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php b/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php index d74005355c..6f0d42c52e 100644 --- a/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php +++ b/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueueAction.class.php @@ -128,7 +128,7 @@ class ModerationQueueAction extends AbstractDatabaseObjectAction { $queues = array(); if (!empty($queueIDs)) { $queueList = new ViewableModerationQueueList(); - $queueList->setObjectIDs($queueIDs); + $queueList->getConditionBuilder()->add("moderation_queue.queueID IN (?)", array($queueIDs)); $queueList->loadUserProfiles = true; $queueList->readObjects(); $queues = $queueList->getObjects(); @@ -141,6 +141,7 @@ class ModerationQueueAction extends AbstractDatabaseObjectAction { // load more entries to fill up list $queueList = new ViewableModerationQueueList(); $queueList->getConditionBuilder()->add("moderation_queue.status IN (?)", array(array(ModerationQueue::STATUS_OUTSTANDING, ModerationQueue::STATUS_PROCESSING))); + $queueList->getConditionBuilder()->add("moderation_queue.queueID NOT IN (?)", array($queueIDs)); $queueList->sqlOrderBy = "moderation_queue.lastChangeTime DESC"; $queueList->sqlLimit = 5 - $count; $queueList->loadUserProfiles = true; -- 2.20.1