From 588ff917bac29767f2c51cd3fbf7021212acee5f Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 22 Nov 2016 15:36:50 +0100
Subject: [PATCH] Preparing release 3.0.0 Beta 5

---
 com.woltlab.wcf/package.xml                   | 32 +++++++++++++------
 com.woltlab.wcf/update_3.0.0_beta_2.sql       |  8 -----
 com.woltlab.wcf/update_3.0.0_beta_5.sql       |  2 ++
 .../install/files/lib/system/WCF.class.php    |  2 +-
 4 files changed, 25 insertions(+), 19 deletions(-)
 delete mode 100644 com.woltlab.wcf/update_3.0.0_beta_2.sql
 create mode 100644 com.woltlab.wcf/update_3.0.0_beta_5.sql

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 5e60ae8caf..e76ffdd6df 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.0.0 Beta 4</version> <!-- codename: vortex -->
-		<date>2016-10-27</date>
+		<version>3.0.0 Beta 5</version> <!-- codename: vortex -->
+		<date>2016-11-23</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -43,14 +43,6 @@
 		<instruction type="script">acp/post_install.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="3.0.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="language" />
-	</instructions>
-	
 	<instructions type="update" fromversion="2.1.12">
 		<instruction type="file">files_pre_update.tar</instruction>
 		<instruction type="script">acp/update_com.woltlab.wcf_3.0_pre_sql.php</instruction>
@@ -95,4 +87,24 @@
 		
 		<instruction type="script">acp/update_com.woltlab.wcf_3.0_post_sql.php</instruction>
 	</instructions>
+	
+	<instructions type="update" fromversion="3.0.0 Beta 4">
+		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+		<instruction type="file" run="standalone">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+		
+		<instruction type="sql">update_3.0.0_beta_5.sql</instruction>
+		
+		<instruction type="language" />
+		
+		<instruction type="acpMenu" />
+		<instruction type="bbcode" />
+		<instruction type="coreObject" />
+		<instruction type="objectType" />
+		<instruction type="objectTypeDefinition" />
+		<instruction type="option" />
+		<instruction type="packageInstallationPlugin" />
+		<instruction type="page" />
+		<instruction type="userGroupOption" />
+	</instructions>
 </package>
diff --git a/com.woltlab.wcf/update_3.0.0_beta_2.sql b/com.woltlab.wcf/update_3.0.0_beta_2.sql
deleted file mode 100644
index 4681a93264..0000000000
--- a/com.woltlab.wcf/update_3.0.0_beta_2.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-/* 1535ab4ef15edc761a02e91e25e28e866716c0b5 */
-ALTER TABLE wcf1_application DROP COLUMN cookiePath;
-
-/* d3925b67b9eba7eaef81887a0cf772dcfc5baa15 */
-UPDATE wcf1_style_variable SET defaultValue = 'rgba(217, 220, 222, 1)' WHERE variableName = 'wcfFooterCopyrightLink';
-
-/* 640a8bea2af6fd577932e9a083fc800c7d1a1190 */
-DELETE FROM wcf1_style_variable WHERE variableName IN ('wcfButtonBorder', 'wcfButtonBorderActive', 'wcfButtonDisabledBorder', 'wcfButtonPrimaryBorder', 'wcfButtonPrimaryBorderActive', 'wcfDropdownBorder');
diff --git a/com.woltlab.wcf/update_3.0.0_beta_5.sql b/com.woltlab.wcf/update_3.0.0_beta_5.sql
new file mode 100644
index 0000000000..27f245fb23
--- /dev/null
+++ b/com.woltlab.wcf/update_3.0.0_beta_5.sql
@@ -0,0 +1,2 @@
+/* 1fee22a07a7ed2e759bef5a3fb87476576508b60 */
+ALTER TABLE wcf1_style_variable SET defaultValue = '1025px' WHERE variableName = 'wcfLayoutMinWidth';
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 82cf56e629..e4e167a1ef 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -46,7 +46,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '3.0.0 Beta 4');
+define('WCF_VERSION', '3.0.0 Beta 5');
 
 // define current unix timestamp
 define('TIME_NOW', time());
-- 
2.20.1