Preparing release 2.1.8 pl 1

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index f4b8f990c56b4ad75c3138356254a83d890d33f2..92e1d9334f9fb7f565031a6786b4fd3dad59e20f 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.8</version> <!-- codename: typhoon -->
-               <date>2015-10-23</date>
+               <version>2.1.8 pl 1</version> <!-- codename: typhoon -->
+               <date>2015-10-29</date>
        </packageinformation>
        
        <authorinformation>
@@ -89,20 +89,7 @@
                <instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="2.1.7">
-               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
+       <instructions type="update" fromversion="2.1.8">
                <instruction type="file">files_update.tar</instruction>
-               
-               <instruction type="language">language/*.xml</instruction>
-               
-               <instruction type="style">blue-temptation-style.tgz</instruction>
-       </instructions>
-       <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 474ddd56dcd7bafe11ffc7cda06882706c030ffa..dbd50ef013f5fc83f6fbd6404a3e1c29b77d8b8d 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.8 (Typhoon)');
+define('WCF_VERSION', '2.1.8 pl 1 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());