From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 23 Nov 2020 15:34:03 +0000 (+0100)
Subject: Merge branch '5.2' into 5.3
X-Git-Tag: 5.3.1~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b117429724cbefd94f42ec9aee207860248b5e8a;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.2' into 5.3
---

b117429724cbefd94f42ec9aee207860248b5e8a
diff --cc wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3_orphanedComments.php
index f478ffccba,0000000000..7ab0dcb1a9
mode 100644,000000..100644
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3_orphanedComments.php
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3_orphanedComments.php
@@@ -1,29 -1,0 +1,28 @@@
 +<?php
 +namespace wcf\acp;
 +
 +use wcf\data\object\type\ObjectTypeCache;
 +use wcf\system\comment\CommentHandler;
 +use wcf\system\WCF;
 +
 +// Earlier versions did remove moderation queues without taking care of
 +// comments associated with them.
 +$commentObjectTypeID = ObjectTypeCache::getInstance()->getObjectTypeIDByName(
 +	"com.woltlab.wcf.comment.commentableContent",
 +	"com.woltlab.wcf.moderation.queue"
 +);
 +
 +$sql = "SELECT  DISTINCT objectID
 +        FROM    wcf" . WCF_N . "_comment
 +        WHERE   objectTypeID = ?
 +        AND     objectID NOT IN (
 +                        SELECT  queueID
 +                        FROM    wcf" . WCF_N . "_moderation_queue
 +                )";
 +$statement = WCF::getDB()->prepareStatement($sql);
 +$statement->execute([$commentObjectTypeID]);
 +$objectIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
 +
- CommentHandler::getInstance()->deleteObjects(
- 	"com.woltlab.wcf.moderation.queue",
- 	$objectIDs
- );
++if (!empty($objectIDs)) {
++	CommentHandler::getInstance()->deleteObjects("com.woltlab.wcf.moderation.queue", $objectIDs);
++}