From f605b5061b2ab2853e2d08679a3bffd3f2b4ddbd Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 15 Sep 2013 20:01:39 +0200
Subject: [PATCH] Preparing update 2.0.0 Beta 9

---
 com.woltlab.wcf/package.xml                   | 15 ++++----
 com.woltlab.wcf/update_b8.sql                 | 12 -------
 .../files/acp/update_com.woltlab.wcf.b8.php   | 34 -------------------
 .../install/files/lib/system/WCF.class.php    |  2 +-
 4 files changed, 9 insertions(+), 54 deletions(-)
 delete mode 100644 com.woltlab.wcf/update_b8.sql
 delete mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf.b8.php

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index a083588ad0..51c69738eb 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.0.0 Beta 8</version> <!-- codename: maelstrom -->
-		<date>2013-09-05</date>
+		<version>2.0.0 Beta 9</version> <!-- codename: maelstrom -->
+		<date>2013-09-15</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -43,15 +43,16 @@
 		<instruction type="script">acp/post_install.php</instruction> 
 	</instructions>
 	
-	<instructions type="update" fromversion="2.0.0 Beta 7">
+	<instruction type="update" fromversion="2.0.0 Beta 8">
 		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 		<instruction type="file">files_update.tar</instruction>
 		<instruction type="template">templates_update.tar</instruction>
 		
 		<instruction type="language">language/*.xml</instruction>
-		<instruction type="sql">update_b8.sql</instruction>
-		<instruction type="script">acp/update_com.woltlab.wcf.b8.php</instruction>
+		<instruction type="sql">update_b9.sql</instruction>
+		<instruction type="sql" run="standalone">update_b9_indices.sql</instruction>
+		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf.b9.php</instruction>
 		
-		<instruction type="style">blue-temptation-style.tgz</instruction>
-	</instructions>
+		<instruction type="userGroupOption">userGroupOption.xml</instruction>
+	</instruction>
 </package>
diff --git a/com.woltlab.wcf/update_b8.sql b/com.woltlab.wcf/update_b8.sql
deleted file mode 100644
index b527d05e30..0000000000
--- a/com.woltlab.wcf/update_b8.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-/* da06d70 */
-ALTER TABLE wcf1_category CHANGE parentCategoryID parentCategoryID INT(10) NOT NULL DEFAULT 0;
-ALTER TABLE wcf1_category CHANGE showOrder showOrder INT(10) NOT NULL DEFAULT 0;
-ALTER TABLE wcf1_category CHANGE time time INT(10) NOT NULL DEFAULT 0;
-
-/* a78137a & f9fa1d1 */
-DELETE FROM wcf1_style_variable WHERE variableName = 'wcfLayoutFluidGap';
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfLayoutMinWidth', '980px');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfLayoutMaxWidth', '90%');
-
-/* c72b4ce */
-ALTER TABLE wcf1_search_index CHANGE languageID languageID INT(10) NOT NULL DEFAULT 0;
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf.b8.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf.b8.php
deleted file mode 100644
index be1569c8e7..0000000000
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf.b8.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-use wcf\system\WCF;
-
-/**
- * @author	Alexander Ebert
- * @copyright	2001-2013 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @category	Community Framework
- */
-$sql = "SELECT	COUNT(*) AS count
-	FROM	wcf".WCF_N."_package_installation_sql_log
-	WHERE	sqlTable = ?
-		AND sqlColumn = ?";
-$statement = WCF::getDB()->prepareStatement($sql);
-$statement->execute(array(
-	'wcf'.WCF_N.'_user_group',
-	'groupDescription'
-));
-$row = $statement->fetchArray();
-
-if ($row['count']) {
-	$sql = "DELETE FROM	wcf".WCF_N."_package_installation_sql_log
-		WHERE		sqlTable = ?
-				AND sqlColumn = ?";
-	$statement = WCF::getDB()->prepareStatement($sql);
-	$statement->execute(array(
-		'wcf'.WCF_N.'_user_group',
-		'groupDescription'
-	));
-}
-else {
-	WCF::getDB()->getEditor()->addColumn("wcf".WCF_N."_user_group", 'groupDescription', array('type' => 'TEXT'));
-}
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index b38ef051db..f099744e7e 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -36,7 +36,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.0.0 Beta 8 (Maelstrom)');
+define('WCF_VERSION', '2.0.0 Beta 9 (Maelstrom)');
 
 // define current unix timestamp
 define('TIME_NOW', time());
-- 
2.20.1