From 7e1a392cee043da4234ef418fcbc73064f6f45af Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Mon, 5 Aug 2013 11:14:05 +0200 Subject: [PATCH] Makes sure that done moderation queues stay marked done Fixes #1425 --- .../lib/form/AbstractModerationForm.class.php | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/wcfsetup/install/files/lib/form/AbstractModerationForm.class.php b/wcfsetup/install/files/lib/form/AbstractModerationForm.class.php index 20a6f77289..69acb392e4 100644 --- a/wcfsetup/install/files/lib/form/AbstractModerationForm.class.php +++ b/wcfsetup/install/files/lib/form/AbstractModerationForm.class.php @@ -139,16 +139,18 @@ abstract class AbstractModerationForm extends AbstractForm { 'assignedUserID' => ($this->assignedUserID ?: null), 'comment' => $this->comment ); - if ($this->assignedUserID) { - // queue item is being processed - if ($this->assignedUserID != $this->queue->assignedUserID) { - $this->data['status'] = ModerationQueue::STATUS_PROCESSING; + if ($this->queue->status != ModerationQueue::STATUS_DONE) { + if ($this->assignedUserID) { + // queue item is being processed + if ($this->assignedUserID != $this->queue->assignedUserID) { + $this->data['status'] = ModerationQueue::STATUS_PROCESSING; + } } - } - else { - // queue is no longer processed, mark as outstanding - if ($this->queue->assignedUserID) { - $this->data['status'] = ModerationQueue::STATUS_OUTSTANDING; + else { + // queue is no longer processed, mark as outstanding + if ($this->queue->assignedUserID) { + $this->data['status'] = ModerationQueue::STATUS_OUTSTANDING; + } } } -- 2.20.1