From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 9 Mar 2018 23:55:24 +0000 (+0100)
Subject: Preparing release 3.0.13
X-Git-Tag: 3.0.13~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=67a7b6347a5a3a8731b8d4fa9741a4ad3e546c99;p=GitHub%2FWoltLab%2FWCF.git

Preparing release 3.0.13
---

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 681437152e..6d32d7ee7a 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>3.0.12 pl 1</version> <!-- codename: vortex -->
-		<date>2018-02-12</date>
+		<version>3.0.13</version> <!-- codename: vortex -->
+		<date>2018-03-12</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -43,7 +43,7 @@
 		<instruction type="script">acp/post_install.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="2.1.19">
+	<instructions type="update" fromversion="2.1.20">
 		<instruction type="file">files_pre_update.tar</instruction>
 		<instruction type="script">acp/update_com.woltlab.wcf_3.0_pre_sql.php</instruction>
 		<instruction type="sql">update_part1.sql</instruction>
@@ -92,7 +92,15 @@
 		<instruction type="script">acp/update_com.woltlab.wcf_3.0_post_sql.php</instruction>
 	</instructions>
 	
+	<!-- WARNING: Keep both update blocks below in sync! -->
 	<instructions type="update" fromversion="3.0.12">
+		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+		<instruction type="file">files_update.tar</instruction>
+		
+		<instruction type="language" />
+	</instructions>
+	<instructions type="update" fromversion="3.0.12 pl 1">
+		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 		<instruction type="file">files_update.tar</instruction>
 		
 		<instruction type="language" />
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index c6df67f4ef..f292150e33 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -47,7 +47,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '3.0.12 pl 1');
+define('WCF_VERSION', '3.0.13');
 
 // define current unix timestamp
 define('TIME_NOW', time());