From 31fce7d4b7a1caec879885b8ba05655a0f581cc0 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 28 Mar 2015 02:02:12 +0100
Subject: [PATCH] Preparing release 2.1.2 pl 1

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

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 9678af5fc3..c52ac2c287 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,7 +5,7 @@
 		<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</version> <!-- codename: typhoon -->
+		<version>2.1.2 pl 1</version> <!-- codename: typhoon -->
 		<date>2015-03-28</date>
 	</packageinformation>
 	
@@ -89,14 +89,7 @@
 		<instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="2.1.1">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+	<instructions type="update" fromversion="2.1.2">
 		<instruction type="file">files_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
-		
-		<instruction type="language" run="standalone">language/*.xml</instruction>
-		<instruction type="option">option.xml</instruction>
-		
-		<instruction type="sql">update_212.sql</instruction>
 	</instructions>
 </package>
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 984b90b79a..c1f9368050 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 (Typhoon)');
+define('WCF_VERSION', '2.1.2 pl 1 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());
-- 
2.20.1