Preparing release 3.1.0 Beta 4

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index a285ab381564a802f323e0d6fdb60b48b24894a4..8299eb84a43e27827c62b886f43a88302174f1f1 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 Beta 3</version> <!-- codename: tornado -->
-               <date>2017-11-13</date>
+               <version>3.1.0 Beta 4</version> <!-- codename: tornado -->
+               <date>2017-12-08</date>
        </packageinformation>
        
        <authorinformation>
@@ -48,20 +48,19 @@
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="3.1.0 Beta 2">
+       <instructions type="update" fromversion="3.1.0 Beta 3">
                <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
-               <instruction type="template">templates_update.tar</instruction>
+               <instruction type="template">files_update.tar</instruction>
                
-               <instruction type="sql" run="standalone">update_3.1.0_beta_3.sql</instruction>
+               <instruction type="sql">update_3.1.0_beta_4</instruction>
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_3.1.0_beta_4_addColumn.php</instruction>
                
                <instruction type="language" />
                
-               <instruction type="acpMenu" />
                <instruction type="mediaProvider" />
                <instruction type="objectType" />
                <instruction type="option" />
-               
-               <instruction type="style">defaultStyle.tar</instruction>
+               <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 3b1c8569b486f5e849cec631c8825b13a9bd88e3..c4972844b090850658ebbc0c45c49df751fdc87c 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.0 Beta 3');
+define('WCF_VERSION', '3.1.0 Beta 4');
 
 // define current API version
 define('WSC_API_VERSION', 2018);