Preparing release 3.0.14

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 4763eb1ce0d14c1445405d08a407967f558ed7d5..8e7880c472396a452adc6ce94a41ecaed6f6b058 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.0.13</version> <!-- codename: vortex -->
-               <date>2018-03-14</date>
+               <version>3.0.14</version> <!-- codename: vortex -->
+               <date>2018-04-16</date>
        </packageinformation>
        
        <authorinformation>
@@ -43,7 +43,7 @@
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="2.1.20">
+       <instructions type="update" fromversion="2.1.21">
                <instruction type="file">files_pre_update.tar</instruction>
                <instruction type="script">acp/update_com.woltlab.wcf_3.0_pre_sql.php</instruction>
                <instruction type="sql">update_part1.sql</instruction>
@@ -92,17 +92,18 @@
                <instruction type="script">acp/update_com.woltlab.wcf_3.0_post_sql.php</instruction>
        </instructions>
        
-       <!-- WARNING: Keep both update blocks below in sync! -->
-       <instructions type="update" fromversion="3.0.12">
+       <!-- WARNING: Include the update script! `acp/update_com.woltlab.wcf_3.0.14.php` -->
+       <instructions type="update" fromversion="3.0.13">
                <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.0.12 pl 1">
-               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
-               <instruction type="file">files_update.tar</instruction>
+               <instruction type="script">acp/update_com.woltlab.wcf_3.0.14.php</instruction>
                
                <instruction type="language" />
+               
+               <instruction type="option" />
+               <instruction type="page" />
+               <instruction type="userGroupOption" />
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index bc02426bac2962e01516b9d6e61fe9e9c5636433..68aba8ff909f85c3e821c36a0b0726f27e462ca9 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -47,7 +47,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '3.0.13');
+define('WCF_VERSION', '3.0.14');
 
 // define current unix timestamp
 define('TIME_NOW', time());