Preparing internal release 3.1.0 Alpha 4

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index c7f1a0711adf51f9c2116563ff50170feeaf360c..68687ce4227dd472f2b8edee4a1d806624169970 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.0 Alpha 3</version> <!-- codename: tornado -->
-               <date>2017-09-07</date>
+               <version>3.1.0 Alpha 4</version> <!-- codename: tornado -->
+               <date>2017-09-19</date>
        </packageinformation>
        
        <authorinformation>
@@ -48,6 +48,7 @@
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
        
+       <!--
        <instructions type="update" fromversion="3.0.8">
                <instruction type="acpTemplate" />
                <instruction type="template" />
@@ -80,28 +81,27 @@
                <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.1_pageSearchIndex.php</instruction>
                
                <instruction type="page" />
+       -->
                <!-- contains a reference to a new page -->
+       <!--
                <instruction type="menuItem" />
                
                <instruction type="packageInstallationPlugin" />
-               <!-- new pip -->
+       -->     <!-- new pip -->
+       <!--
                <instruction type="mediaProvider" />
                
                <instruction type="style">defaultStyle.tar</instruction>
                
                <instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.1_postUpgrade.php</instruction>
        </instructions>
+       -->
        
-       <instructions type="update" fromversion="3.1.0 Alpha 2">
+       <instructions type="update" fromversion="3.1.0 Alpha 3">
                <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="sql">update_3.1.0_alpha_2.sql</instruction>
-               
-               <instruction type="mediaProvider" />
-               <instruction type="option" />
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 3be1593e561b0746d802876ad3a135df0dddeded..28a379d69ec287cb070bdb25a66836f50893a419 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.1.0 Alpha 3');
+define('WCF_VERSION', '3.1.0 Alpha 4');
 
 // define current unix timestamp
 define('TIME_NOW', time());