From abc3bb1c493944c9f2862007aaf7cdd846aa5a0e Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 23 Jan 2015 18:27:59 +0100
Subject: [PATCH] Preparing internal update 2.0 -> 2.1

---
 ...onjob_update.xml => cronjob_update210.xml} |  0
 com.woltlab.wcf/package.xml                   | 32 ++++++++-----------
 com.woltlab.wcf/update_2.1.0_beta_2.sql       |  2 --
 ...pdate_2.1.0_alpha_1.sql => update_210.sql} |  0
 ...2.1.0_alpha_1.sql => update_user1_210.sql} |  0
 ...2.1.0_alpha_1.sql => update_user2_210.sql} |  0
 ...2.1.0_alpha_1.sql => update_user3_210.sql} |  0
 ...2.1.0_alpha_1.sql => update_user4_210.sql} |  0
 .../install/files/lib/system/WCF.class.php    |  2 +-
 9 files changed, 15 insertions(+), 21 deletions(-)
 rename com.woltlab.wcf/{cronjob_update.xml => cronjob_update210.xml} (100%)
 delete mode 100644 com.woltlab.wcf/update_2.1.0_beta_2.sql
 rename com.woltlab.wcf/{update_2.1.0_alpha_1.sql => update_210.sql} (100%)
 rename com.woltlab.wcf/{update_user1_2.1.0_alpha_1.sql => update_user1_210.sql} (100%)
 rename com.woltlab.wcf/{update_user2_2.1.0_alpha_1.sql => update_user2_210.sql} (100%)
 rename com.woltlab.wcf/{update_user3_2.1.0_alpha_1.sql => update_user3_210.sql} (100%)
 rename com.woltlab.wcf/{update_user4_2.1.0_alpha_1.sql => update_user4_210.sql} (100%)

diff --git a/com.woltlab.wcf/cronjob_update.xml b/com.woltlab.wcf/cronjob_update210.xml
similarity index 100%
rename from com.woltlab.wcf/cronjob_update.xml
rename to com.woltlab.wcf/cronjob_update210.xml
diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index bf0a9b0cfd..36fb6f730e 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
 		<packagedescription><![CDATA[Free web-framework, designed and developed for complex community applications.]]></packagedescription>
 		<packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
 		<isapplication>1</isapplication>
-		<version>2.1.0 Beta 3</version> <!-- codename: typhoon -->
-		<date>2015-01-09</date>
+		<version>2.1.0 Beta 4</version> <!-- codename: typhoon -->
+		<date>2015-01-23</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -43,18 +43,15 @@
 		<instruction type="script">acp/post_install.php</instruction>
 	</instructions>
 	
-	<!--
-		Update has not been tested with the changes since Alpha 1, disabled for now and will return in a future beta release (NOT beta 1!)
-		
 	<instructions type="update" fromversion="2.0.10">
-		--><!-- pre-update check to prevent update from WCF < 2.0.10 --><!--
+		<!-- pre-update check to prevent update from WCF < 2.0.10 -->
 		<instruction type="file">pre_update_check.tar</instruction>
 		<instruction type="script" run="standalone">acp/pre_update_com.woltlab.wcf_2.1.php</instruction>
 		
-		--><!-- the actual update --><!--
+		<!-- the actual update -->
 		<instruction type="option" run="standalone">option.xml</instruction>
 		
-		<instruction type="file">files_update.tar</instruction>
+		<instruction type="file">files.tar</instruction>
 		<instruction type="script">acp/update_com.woltlab.wcf_2.1.php</instruction>
 		
 		<instruction type="template" run="standalone">templates_update.tar</instruction>
@@ -63,21 +60,23 @@
 		
 		<instruction type="language" run="standalone">language/*.xml</instruction>
 		
-		<instruction type="sql" run="standalone">update_2.1.0_alpha_1.sql</instruction>
+		<instruction type="sql" run="standalone">update_210.sql</instruction>
 		
-		<instruction type="sql" run="standalone">update_user1_2.1.0_alpha_1.sql</instruction>
-		<instruction type="sql" run="standalone">update_user2_2.1.0_alpha_1.sql</instruction>
-		<instruction type="sql" run="standalone">update_user3_2.1.0_alpha_1.sql</instruction>
-		<instruction type="sql" run="standalone">update_user4_2.1.0_alpha_1.sql</instruction>
+		<instruction type="sql" run="standalone">update_user1_210.sql</instruction>
+		<instruction type="sql" run="standalone">update_user2_210.sql</instruction>
+		<instruction type="sql" run="standalone">update_user3_210.sql</instruction>
+		<instruction type="sql" run="standalone">update_user4_210.sql</instruction>
 		
 		<instruction type="acpMenu">acpMenu.xml</instruction>
 		<instruction type="bbcode">bbcode.xml</instruction>
+		<instruction type="style">blue-temptation-style.tgz</instruction>
 		<instruction type="clipboardAction">clipboardAction.xml</instruction>
 		<instruction type="coreObject">coreObject.xml</instruction>
-		<instruction type="cronjob">cronjob_update.xml</instruction>
+		<instruction type="cronjob">cronjob_update410.xml</instruction>
 		<instruction type="dashboardBox">dashboardBox.xml</instruction>
 		<instruction type="objectTypeDefinition">objectTypeDefinition.xml</instruction>
 		<instruction type="objectType">objectType.xml</instruction>
+		<instruction type="option">option.xml</instruction>
 		<instruction type="pageMenu">pageMenu.xml</instruction>
 		<instruction type="userGroupOption">userGroupOption.xml</instruction>
 		<instruction type="userMenu">userMenu.xml</instruction>
@@ -87,15 +86,12 @@
 		
 		<instruction type="script" run="standalone">acp/update_mqc_com.woltlab.wcf_2.1.php</instruction>
 	</instructions>
-	-->
 	
-	<instructions type="update" fromversion="2.1.0 Beta 2">
+	<instructions type="update" fromversion="2.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="language" run="standalone">language/*.xml</instruction>
-		
-		<instruction type="sql">update_2.1.0_beta_2.sql</instruction>
 	</instructions>
 </package>
diff --git a/com.woltlab.wcf/update_2.1.0_beta_2.sql b/com.woltlab.wcf/update_2.1.0_beta_2.sql
deleted file mode 100644
index 6d0ffafcbc..0000000000
--- a/com.woltlab.wcf/update_2.1.0_beta_2.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE wcf1_package_update_server ADD apiVersion ENUM('2.0', '2.1') NOT NULL DEFAULT '2.0';
-ALTER TABLE wcf1_package_update_server ADD metaData TEXT;
\ No newline at end of file
diff --git a/com.woltlab.wcf/update_2.1.0_alpha_1.sql b/com.woltlab.wcf/update_210.sql
similarity index 100%
rename from com.woltlab.wcf/update_2.1.0_alpha_1.sql
rename to com.woltlab.wcf/update_210.sql
diff --git a/com.woltlab.wcf/update_user1_2.1.0_alpha_1.sql b/com.woltlab.wcf/update_user1_210.sql
similarity index 100%
rename from com.woltlab.wcf/update_user1_2.1.0_alpha_1.sql
rename to com.woltlab.wcf/update_user1_210.sql
diff --git a/com.woltlab.wcf/update_user2_2.1.0_alpha_1.sql b/com.woltlab.wcf/update_user2_210.sql
similarity index 100%
rename from com.woltlab.wcf/update_user2_2.1.0_alpha_1.sql
rename to com.woltlab.wcf/update_user2_210.sql
diff --git a/com.woltlab.wcf/update_user3_2.1.0_alpha_1.sql b/com.woltlab.wcf/update_user3_210.sql
similarity index 100%
rename from com.woltlab.wcf/update_user3_2.1.0_alpha_1.sql
rename to com.woltlab.wcf/update_user3_210.sql
diff --git a/com.woltlab.wcf/update_user4_2.1.0_alpha_1.sql b/com.woltlab.wcf/update_user4_210.sql
similarity index 100%
rename from com.woltlab.wcf/update_user4_2.1.0_alpha_1.sql
rename to com.woltlab.wcf/update_user4_210.sql
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 9cb8038dfd..2646dad186 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -37,7 +37,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.1.0 Beta 3 (Typhoon)');
+define('WCF_VERSION', '2.1.0 Beta 4 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());
-- 
2.20.1