From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 20 Mar 2014 00:36:59 +0000 (+0100)
Subject: Work-around the issue in 4.0.3 (pl 1) -> 4.0.4
X-Git-Tag: 2.0.4_pl_1~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8db15c7062514891c5c077d88c9a80ff825d0d73;p=GitHub%2FWoltLab%2FWCF.git

Work-around the issue in 4.0.3 (pl 1) -> 4.0.4
---

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 9d33eeb208..ccf7fea5cb 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
 		<packagedescription><![CDATA[Free web-framework, designed and developed for complex community applications.]]></packagedescription>
 		<packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
 		<isapplication>1</isapplication>
-		<version>2.0.4</version> <!-- codename: maelstrom -->
-		<date>2014-03-19</date>
+		<version>2.0.4 pl 1</version> <!-- codename: maelstrom -->
+		<date>2014-03-20</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -43,23 +43,7 @@
 		<instruction type="script">acp/post_install.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="2.0.3">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
-		<instruction type="file">files_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
-		<instruction type="script">acp/update_com.woltlab.wcf_2.0.4.php</instruction>
-		
-		<instruction type="language">languages/*</instruction>
-		<instruction type="smiley">smiley.xml</instruction>
-		<instruction type="userOption">userOption.xml</instruction>
-	</instructions>
-	
-	<instructions type="update" fromversion="2.0.3 pl 1">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
-		<instruction type="file">files_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
-		<instruction type="script">acp/update_com.woltlab.wcf_2.0.4.php</instruction>
-		
+	<instructions type="update" fromversion="2.0.4">
 		<instruction type="language">languages/*</instruction>
 		<instruction type="smiley">smiley.xml</instruction>
 		<instruction type="userOption">userOption.xml</instruction>
diff --git a/com.woltlab.wcf/update_2.0.3.sql b/com.woltlab.wcf/update_2.0.3.sql
deleted file mode 100644
index 1c4bebf562..0000000000
--- a/com.woltlab.wcf/update_2.0.3.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-/* 644b0ee */
-ALTER TABLE wcf1_user_collapsible_content CHANGE objectID objectID VARCHAR(255) NOT NULL;
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_2.0.4.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_2.0.4.php
deleted file mode 100644
index d408c0c0c5..0000000000
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_2.0.4.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-use wcf\data\like\object\LikeObjectList;
-use wcf\data\object\type\ObjectTypeCache;
-use wcf\system\like\LikeHandler;
-
-/**
- * @author	Matthias Schmidt
- * @copyright	2001-2014 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @category	Community Framework
- */
-// delete likes for deleted comments responses
-$likeObjectList = new LikeObjectList();
-$likeObjectList->sqlJoins = "LEFT JOIN wcf".WCF_N."_comment_response comment_response ON (comment_response.responseID = like_object.objectID)";
-$likeObjectList->getConditionBuilder()->add('like_object.objectTypeID = ?', array(ObjectTypeCache::getInstance()->getObjectTypeIDByName('com.woltlab.wcf.like.likeableObject', 'com.woltlab.wcf.comment.response')));
-$likeObjectList->getConditionBuilder()->add('comment_response.responseID IS NULL');
-$likeObjectList->readObjects();
-
-$deletedResponseIDs = array();
-foreach ($likeObjectList as $likeObject) {
-	$deletedResponseIDs[] = $likeObject->objectID;
-}
-
-if (!empty($deletedResponseIDs)) {
-	LikeHandler::getInstance()->removeLikes('com.woltlab.wcf.comment.response', $deletedResponseIDs);
-}