Preparing the release 3.1.12

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index fd084b9ba204bb9b7ca106e0c1a611f20acb9cfe..f7a1d756759c5793a457453bd1fa9c369418bc83 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.11</version> <!-- codename: tornado -->
-               <date>2019-10-23</date>
+               <version>3.1.12</version> <!-- codename: tornado -->
+               <date>2020-02-23</date>
        </packageinformation>
        
        <authorinformation>
@@ -97,25 +97,15 @@
                <instruction type="style">defaultStyle.tar</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="3.1.10">
+       <instructions type="update" fromversion="3.1.11">
                <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
                <instruction type="template">templates_update.tar</instruction>
                
                <instruction type="language" />
-       </instructions>
-       <instructions type="update" fromversion="3.1.10 pl 1">
-               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
-               <instruction type="file">files_update.tar</instruction>
-               <instruction type="template">templates_update.tar</instruction>
-               
-               <instruction type="language" />
-       </instructions>
-       <instructions type="update" fromversion="3.1.10 pl 2">
-               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
-               <instruction type="file">files_update.tar</instruction>
-               <instruction type="template">templates_update.tar</instruction>
                
-               <instruction type="language" />
+               <instruction type="mediaProvider" />
+               <instruction type="option" />
+               <instruction type="page" />
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index bf339e765e3e69ac6c0660d3d26b81d5a00bac8b..2ac0c5f7aa77b3fb4a7f121608df9fbd7a8fea40 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.11');
+define('WCF_VERSION', '3.1.12');
 
 // define current API version
 define('WSC_API_VERSION', 2018);