Merge branch '6.1' into 6.2

Author: BurntimeX

wcfsetup/install/files/lib/system/moderation/queue/AbstractCommentCommentModerationQueueHandler.class.php

@@ -143,6 +143,20 @@ public function populate(array $queues)
         }
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function canRemoveContent(ModerationQueue $queue)
+    {
+        if ($this->isValid($queue->objectID)) {
+            $comment = $this->getComment($queue->objectID);
+
+            return $this->getCommentManager($comment)->canDeleteComment($comment);
+        }
+
+        return false;
+    }
+
     /**
      * @inheritDoc
      */

wcfsetup/install/files/lib/system/moderation/queue/AbstractCommentResponseModerationQueueHandler.class.php

@@ -187,4 +187,18 @@ public function isAffectedUser(ModerationQueue $queue, $userID)
             UserProfileRuntimeCache::getInstance()->getObject($userID)
         );
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function canRemoveContent(ModerationQueue $queue)
+    {
+        if ($this->isValid($queue->objectID)) {
+            $response = $this->getResponse($queue->objectID);
+
+            return $this->getCommentManager($response->getComment())->canDeleteResponse($response);
+        }
+
+        return false;
+    }
 }