Preparing internal release 2.1.6

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 880764bd03205ecd9ddc5e64c1be9a8e49d3887e..e85a13481733274a00555ab6772949d0335bfb1e 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.5</version> <!-- codename: typhoon -->
-               <date>2015-06-30</date>
+               <version>2.1.6</version> <!-- codename: typhoon -->
+               <date>2015-07-21</date>
        </packageinformation>
        
        <authorinformation>
@@ -135,9 +135,11 @@
                <instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="2.1.4">
-               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
+       <instructions type="update" fromversion="2.1.5">
                <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
+               
                <instruction type="language" run="standalone">language/*.xml</instruction>
+               <instruction type="objectTypeDefinition">objectTypeDefinition.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 91915f1f3d83814af4bf9083d017191c392bbba7..daadb77e8c2868ab7682abf38c1b1fe70708fde9 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.5 (Typhoon)');
+define('WCF_VERSION', '2.1.6 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());