Preparing release 2.1.4

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 333a3b576bc78184e9fbbd4ff29ed0230075b8c7..adf255f1df81f0afb41e071a58003e3d4452e014 100644 (file)
--- 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.3</version> <!-- codename: typhoon -->
-               <date>2015-04-14</date>
+               <version>2.1.4</version> <!-- codename: typhoon -->
+               <date>2015-05-16</date>
        </packageinformation>
        
        <authorinformation>
@@ -135,35 +135,15 @@
                <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">
+       <instructions type="update" fromversion="2.1.3">
                <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
                <instruction type="template">templates_update.tar</instruction>
+               
+               <instruction type="language" run="standalone">language/*.xml</instruction>
+               
+               <instruction type="bbcode">bbcode.xml</instruction>
+               <instruction type="objectType">objectType.xml</instruction>
+               <instruction type="option">option.xml</instruction>
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 570c02e4e68f062281d93df5cc280cf2041811d6..9be9043f8bd838c12e709f4dabcf360e3308d1a6 100644 (file)
--- 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.3 (Typhoon)');
+define('WCF_VERSION', '2.1.4 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());