Merge remote-tracking branch 'origin/master' into vortex

# Conflicts: # package.xml # update.sql # update126.sql
MysteryCode · Aug 3, 2017 · 5d2d8fe · 5d2d8fe
2 parents 66c60d5 + 646045c
commit 5d2d8fe
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 6 deletions.
diff --git a/files/acp/update_de.mysterycode.wcf.todo.php b/files/acp/update_de.mysterycode.wcf.todo.php
@@ -0,0 +1,43 @@
+<?php
+
+use wcf\data\object\type\ObjectType;
+use wcf\data\todo\ToDoEditor;
+use wcf\data\todo\ToDoList;
+use wcf\system\comment\CommentHandler;
+use wcf\system\WCF;
+
+/**
+ * @author		Florian Gail
+ * @copyright	2014-2016 Florian Gail <https://www.mysterycode.de/>
+ * @license	Kostenlose Plugins <https://downloads.mysterycode.de/license/6-kostenlose-plugins/>
+ * @package	de.mysterycode.wcf.toDo
+ */
+$package = $this->installation->getPackage();
+
+$sql = "SELECT  otype.objectTypeID
+	FROM    wcf" . WCF_N . "_object_type otype,
+		wcf" . WCF_N . "_object_type_definition odef
+	WHERE   otype.objectType = ?
+		AND odef.definitionName = ?
+		AND otype.definitionID = odef.definitionID";
+$statement = WCF::getDB()->prepareStatement($sql);
+$statement->execute(['de.mysterycode.wcf.toDo.toDoComment', 'com.woltlab.wcf.comment.commentableContent']);
+$objectTypeID = $statement->fetchSingleRow(PDO::FETCH_COLUMN);
+
+if ($objectTypeID !== false || !($objectTypeID > 0)) {
+	$objectType = new ObjectType($objectTypeID);
+	$commentManager = $objectType->getProcessor();
+
+	$todoList = new ToDoList();
+	$todoList->readObjects();
+
+	foreach ($todoList->getObjects() as $todo) {
+		$commentList = CommentHandler::getInstance()->getCommentList($commentManager, $objectTypeID, $todo->todoID);
+		$todoEditor = new ToDoEditor($todo);
+		$todoEditor->update([
+			'comments' => $commentList->countObjects()
+		]);
+	}
+}
+
+
diff --git a/package.xml b/package.xml
@@ -55,9 +55,6 @@
 		<instruction type="file" />
 		<instruction type="template" />
 
-		<!-- SQL -->
-		<instruction type="sql">update126.sql</instruction>
-
 		<!-- XMLs -->
 		<instruction type="objectType">xml/objectType.xml</instruction>
 		<instruction type="userNotificationEvent">xml/userNotificationEvent.xml</instruction>
@@ -72,6 +69,10 @@
 		<instruction type="page">xml/page.xml</instruction>
 		<instruction type="menuItem">xml/menuItem.xml</instruction>
 
+		<!-- SQL -->
+		<instruction type="sql">update126.sql</instruction>
+		<instruction type="script">acp/update_de.mysterycode.wcf.todo.php</instruction>
+
 		<instruction type="language" />
 	</instructions>
 	<instructions type="update" fromversion="2.0.0 Beta 2">
@@ -80,9 +81,6 @@
 		<instruction type="file" />
 		<instruction type="template" />
 
-		<!-- SQL -->
-		<instruction type="sql">update200b2.sql</instruction>
-
 		<!-- XMLs -->
 		<instruction type="objectType">xml/objectType.xml</instruction>
 		<instruction type="userNotificationEvent">xml/userNotificationEvent.xml</instruction>
@@ -97,6 +95,9 @@
 		<instruction type="page">xml/page.xml</instruction>
 		<instruction type="menuItem">xml/menuItem.xml</instruction>
 
+		<!-- SQL -->
+		<instruction type="script">acp/update_de.mysterycode.wcf.todo_1.2.0.php</instruction>
+
 		<instruction type="language" />
 	</instructions>
 </package>