From 10acca45b5ae6965ff44fe1ccfd79ee316888f0c Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 29 Jan 2021 15:01:03 +0100
Subject: [PATCH] Release 5.2.11

---
 com.woltlab.wcf/package.xml                   | 10 +++----
 ...om.woltlab.wcf_5.2.10_orphanedComments.php | 28 -------------------
 .../install/files/lib/system/WCF.class.php    |  2 +-
 3 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.10_orphanedComments.php

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 62f1251b63..b57e8c384e 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
 		<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
 		<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
 		<isapplication>1</isapplication>
-		<version>5.2.10</version> <!-- codename: hurricane -->
-		<date>2020-11-23</date>
+		<version>5.2.11</version> <!-- codename: hurricane -->
+		<date>2021-01-29</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -108,15 +108,13 @@
 		<instruction type="script">acp/update_com.woltlab.wcf_preventMailAbuse.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="5.2.9">
+	<instructions type="update" fromversion="5.2.10">
 		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 		<instruction type="file">files_update.tar</instruction>
 		<instruction type="template">templates_update.tar</instruction>
 		
 		<instruction type="language" />
 		
-		<instruction type="script">acp/update_com.woltlab.wcf_5.2.10_orphanedComments.php</instruction>
+		<instruction type="userNotificationEvent" />
 	</instructions>
-	
-	<!-- Delete `update_com.woltlab.wcf_5.2.10_orphanedComments.php` from git for the next update -->
 </package>
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.10_orphanedComments.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.10_orphanedComments.php
deleted file mode 100644
index 7ab0dcb1a9..0000000000
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.10_orphanedComments.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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);
-
-if (!empty($objectIDs)) {
-	CommentHandler::getInstance()->deleteObjects("com.woltlab.wcf.moderation.queue", $objectIDs);
-}
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 3b5c942ced..0bf2b58dd7 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -51,7 +51,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '5.2.10');
+define('WCF_VERSION', '5.2.11');
 
 // define current API version
 // @deprecated 5.2
-- 
2.20.1