Preparing release 2.1.8

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 574855de4dddf5fbac26b0b42eb82e38cadc657f..1abaebde2b5bfce29026066b8d6ebdb564dc97a5 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.7 pl 1</version> <!-- codename: typhoon -->
-               <date>2015-09-04</date>
+               <version>2.1.8</version> <!-- codename: typhoon -->
+               <date>2015-10-20</date>
        </packageinformation>
        
        <authorinformation>
@@ -89,16 +89,20 @@
                <instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="2.1.6">
+       <instructions type="update" fromversion="2.1.7">
+               <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="language">language/*.xml</instruction>
                
-               <instruction type="userGroupOption">userGroupOption.xml</instruction>
+               <instruction type="style">blue-temptation-style.tgz</instruction>
        </instructions>
-       
-       <instructions type="update" fromversion="2.1.7">
+       <instructions type="update" fromversion="2.1.7 pl 1">
+               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
+               
+               <instruction type="language">language/*.xml</instruction>
+               
+               <instruction type="style">blue-temptation-style.tgz</instruction>
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 8d6b7e2f77078d0b17752af7bdda42580155f872..474ddd56dcd7bafe11ffc7cda06882706c030ffa 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.7 pl 1 (Typhoon)');
+define('WCF_VERSION', '2.1.8 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());