From: Matthias Schmidt Date: Sat, 28 Feb 2015 12:13:25 +0000 (+0100) Subject: Fix reporting content with non-outstanding moderation queue entry X-Git-Tag: 2.1.0~9 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f4424189f125e0725ea9c3f6f3ba0c15833c5728;p=GitHub%2FWoltLab%2FWCF.git Fix reporting content with non-outstanding moderation queue entry 35e19e581a5e61f13d37e536710604283b1f0ebf did not adjust `ModerationQueueReportManager::hasPendingReport()` to consider the new moderation queue statuses `ModerationQueue::STATUS_REJECTED` and `ModerationQueue::STATUS_CONFIRMED` so that once reported content could not be reported again. --- diff --git a/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueReportManager.class.php b/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueReportManager.class.php index 401a33863c..6c28d06737 100644 --- a/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueReportManager.class.php +++ b/wcfsetup/install/files/lib/system/moderation/queue/ModerationQueueReportManager.class.php @@ -62,12 +62,13 @@ class ModerationQueueReportManager extends AbstractModerationQueueManager { FROM wcf".WCF_N."_moderation_queue WHERE objectTypeID = ? AND objectID = ? - AND status <> ?"; + AND status IN (?, ?)"; $statement = WCF::getDB()->prepareStatement($sql); $statement->execute(array( $objectTypeID, $objectID, - ModerationQueue::STATUS_DONE + ModerationQueue::STATUS_OUTSTANDING, + ModerationQueue::STATUS_PROCESSING )); return $statement->fetchColumn() > 0;