From ed13e0d52f8e06c67b219d6d4c8516d23e92f053 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 8 Dec 2017 15:27:36 +0100
Subject: [PATCH] Preparing release 3.1.0 Beta 4

---
 com.woltlab.wcf/package.xml                     | 15 +++++++--------
 wcfsetup/install/files/lib/system/WCF.class.php |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index a285ab3815..8299eb84a4 100644
--- 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 3b1c8569b4..c4972844b0 100644
--- 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);
-- 
2.20.1