Preparing the release 3.1.2 pl 2

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 7ecc2b4f5b65b6b3cceba91d5174138ab92186bf..b58f1b094834ed2d9e75a2bf90dff00d522669c2 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
                <packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
                <packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
                <isapplication>1</isapplication>
-               <version>3.1.2 pl 1</version> <!-- codename: tornado -->
-               <date>2018-04-20</date>
+               <version>3.1.2 pl 2</version> <!-- codename: tornado -->
+               <date>2018-04-21</date>
        </packageinformation>
        
        <authorinformation>
@@ -95,23 +95,7 @@
                <instruction type="style">defaultStyle.tar</instruction>
        </instructions>
        
-       <!-- WARNING: Include the update script! `acp/update_com.woltlab.wcf_3.1.2.php` -->
-       <instructions type="update" fromversion="3.1.1">
-               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
+       <instructions type="update" fromversion="3.1.2 pl 1">
                <instruction type="file">files_update.tar</instruction>
-               <instruction type="template">templates_update.tar</instruction>
-               
-               <instruction type="script">acp/update_com.woltlab.wcf_3.1.2.php</instruction>
-               
-               <instruction type="language" />
-               
-               <instruction type="option" />
-               <instruction type="page" />
-               <instruction type="userGroupOption" />
-       </instructions>
-       <instructions type="update" fromversion="3.1.2">
-               <instruction type="file">files_update.tar</instruction>
-               
-               <instruction type="script">acp/update_com.woltlab.wcf_3.1.2.php</instruction>
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index fbc3c855e95cb07d73c291127c5f7438a47e6c42..06aad8f1beecc191d105e76d2c25ac10ba9c5375 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -48,7 +48,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '3.1.2 pl 1');
+define('WCF_VERSION', '3.1.2 pl 2');
 
 // define current API version
 define('WSC_API_VERSION', 2018);