From feef1af0bb2c71f33264fed61f8f8e16eb24d069 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 13 Apr 2015 11:56:31 +0200
Subject: [PATCH] Preparing release 2.1.3

---
 com.woltlab.wcf/package.xml                   | 73 ++++++++++++++++++-
 .../install/files/lib/system/WCF.class.php    |  2 +-
 2 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index e88df508ac..f5dd367ffd 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.1.2 pl 2</version> <!-- codename: typhoon -->
-		<date>2015-04-08</date>
+		<version>2.1.3</version> <!-- codename: typhoon -->
+		<date>2015-04-13</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -89,12 +89,81 @@
 		<instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
 	</instructions>
 	
+	<instructions type="update" fromversion="2.0.12 pl 1">
+		<!-- pre-update check to prevent update from WCF < 2.0.10 -->
+		<instruction type="file">pre_update_check.tar</instruction>
+		<instruction type="script" run="standalone">acp/pre_update_com.woltlab.wcf_2.1.php</instruction>
+		
+		<!-- the actual update -->
+		<instruction type="option" run="standalone">option.xml</instruction>
+		
+		<instruction type="file">files.tar</instruction>
+		<instruction type="script">acp/update_com.woltlab.wcf_2.1.php</instruction>
+		
+		<instruction type="template" run="standalone">templates.tar</instruction>
+		
+		<instruction type="acpTemplate" run="standalone">acptemplates.tar</instruction>
+		
+		<instruction type="language" run="standalone">language/*.xml</instruction>
+		
+		<instruction type="sql" run="standalone">update_210.sql</instruction>
+		
+		<instruction type="sql" run="standalone">update_user1_210.sql</instruction>
+		<instruction type="sql" run="standalone">update_user2_210.sql</instruction>
+		<instruction type="sql" run="standalone">update_user3_210.sql</instruction>
+		<instruction type="sql" run="standalone">update_user4_210.sql</instruction>
+		<instruction type="sql" run="standalone">update_user5_210.sql</instruction>
+		
+		<instruction type="acpMenu">acpMenu.xml</instruction>
+		<instruction type="bbcode">bbcode.xml</instruction>
+		<instruction type="style">blue-temptation-style.tgz</instruction>
+		<instruction type="clipboardAction">clipboardAction.xml</instruction>
+		<instruction type="coreObject">coreObject.xml</instruction>
+		<instruction type="cronjob">cronjob_update210.xml</instruction>
+		<instruction type="dashboardBox">dashboardBox.xml</instruction>
+		<instruction type="objectTypeDefinition">objectTypeDefinition.xml</instruction>
+		<instruction type="objectType">objectType.xml</instruction>
+		<instruction type="option">option.xml</instruction>
+		<instruction type="pageMenu">pageMenu.xml</instruction>
+		<instruction type="userGroupOption">userGroupOption.xml</instruction>
+		<instruction type="userMenu">userMenu.xml</instruction>
+		<instruction type="userNotificationEvent">userNotificationEvent.xml</instruction>
+		<instruction type="userOption">userOption.xml</instruction>
+		<instruction type="userProfileMenu">userProfileMenu.xml</instruction>
+		
+		<instruction type="script" run="standalone">acp/update_mqc_com.woltlab.wcf_2.1.php</instruction>
+		<instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
+	</instructions>
+	
+	<!-- Heads up! Keep all update blocks below in sync! -->
+	
 	<instructions type="update" fromversion="2.1.2">
+		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 		<instruction type="file">files_update.tar</instruction>
 		<instruction type="template">templates_update.tar</instruction>
 	</instructions>
 	
 	<instructions type="update" fromversion="2.1.2 pl 1">
+		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+		<instruction type="file">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+	</instructions>
+	
+	<instructions type="update" fromversion="2.1.2 pl 2">
+		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+		<instruction type="file">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+	</instructions>
+	
+	<instructions type="update" fromversion="2.1.2 pl 3">
+		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+		<instruction type="file">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+	</instructions>
+	
+	<instructions type="update" fromversion="2.1.2 pl 4">
+		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+		<instruction type="file">files_update.tar</instruction>
 		<instruction type="template">templates_update.tar</instruction>
 	</instructions>
 </package>
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index c1f9368050..570c02e4e6 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -38,7 +38,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.1.2 pl 1 (Typhoon)');
+define('WCF_VERSION', '2.1.3 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());
-- 
2.20.1