From 0d24c83ed02f21ace46e5f09cd2e667331612d62 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 30 Jul 2013 17:29:57 +0200
Subject: [PATCH] Preparing update 2.0.0 Beta 6

---
 com.woltlab.wcf/files_pre_update.tar          | Bin 17408 -> 0 bytes
 com.woltlab.wcf/package.xml                   |  16 +++---------
 com.woltlab.wcf/update_b5.sql                 |  24 ------------------
 wcfsetup/install/files/acp/update_b5.php      |  20 ---------------
 .../install/files/lib/system/WCF.class.php    |   2 +-
 5 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 com.woltlab.wcf/files_pre_update.tar
 delete mode 100644 com.woltlab.wcf/update_b5.sql
 delete mode 100644 wcfsetup/install/files/acp/update_b5.php

diff --git a/com.woltlab.wcf/files_pre_update.tar b/com.woltlab.wcf/files_pre_update.tar
deleted file mode 100644
index d62904a47b8e9b2d8829428137030a4668f3e426..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17408
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
SHx7K`z&8$j<G}wb4*UmK0QkKC

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 9d9dd3a61b..fb58f7a5dc 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 5</version> <!-- codename: maelstrom -->
-		<date>2013-07-27</date>
+		<version>2.0.0 Beta 6</version> <!-- codename: maelstrom -->
+		<date>2013-07-30</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -42,20 +42,10 @@
 		<instruction type="script">acp/post_install.php</instruction> 
 	</instructions>
 	
-	<instructions type="update" fromversion="2.0.0 Beta 4">
-		<instruction type="file" run="standalone">files_pre_update.tar</instruction>
-		
+	<instructions type="update" fromversion="2.0.0 Beta 5">
 		<instruction type="file">files_update.tar</instruction>
 		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 		<instruction type="language">language/*.xml</instruction>
 		<instruction type="template">templates_update.tar</instruction>
-		<instruction type="sql">update_b5.sql</instruction>
-		<instruction type="script">acp/update_b5.php</instruction>
-		
-		<instruction type="acpMenu">acpMenu.xml</instruction>
-		<instruction type="objectTypeDefinition">objectTypeDefinition.xml</instruction>
-		<instruction type="objectType">objectType.xml</instruction>
-		<instruction type="option">option.xml</instruction>
-		<instruction type="userGroupOption">userGroupOption.xml</instruction>
 	</instructions>
 </package>
diff --git a/com.woltlab.wcf/update_b5.sql b/com.woltlab.wcf/update_b5.sql
deleted file mode 100644
index 850ce42750..0000000000
--- a/com.woltlab.wcf/update_b5.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-/* 83689a3 */
-ALTER TABLE wcf1_user_group_option DROP COLUMN adminDefaultValue;
-
-/* a16ee11 */
-DROP TABLE wcf1_user_activity_point_event;
-ALTER TABLE wcf1_user_activity_point ADD items INT(10) NOT NULL DEFAULT '0';
-
-/* b33c97d */
-ALTER TABLE wcf1_package_installation_queue DROP COLUMN confirmInstallation;
-ALTER TABLE wcf1_package_installation_queue DROP COLUMN packageType;
-ALTER TABLE wcf1_package_installation_queue ADD isApplication TINYINT(1) NOT NULL DEFAULT '0';
-
-/* 221eee4 */
-ALTER TABLE wcf1_label CHANGE cssClassName cssClassName VARCHAR(255) NOT NULL DEFAULT '';
-
-DROP TABLE IF EXISTS wcf1_import_mapping;
-CREATE TABLE wcf1_import_mapping (
-	objectTypeID INT(10) NOT NULL,
-	oldID VARCHAR(255) NOT NULL,
-	newID INT(10) NOT NULL,
-	UNIQUE KEY (objectTypeID, oldID)
-);
-
-ALTER TABLE wcf1_import_mapping ADD FOREIGN KEY (objectTypeID) REFERENCES wcf1_object_type (objectTypeID) ON DELETE CASCADE;
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/update_b5.php b/wcfsetup/install/files/acp/update_b5.php
deleted file mode 100644
index 739ba8cd3d..0000000000
--- a/wcfsetup/install/files/acp/update_b5.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-use wcf\data\object\type\ObjectTypeCache;
-use wcf\system\WCF;
-
-$sql = "UPDATE	wcf".WCF_N."_user_activity_point
-	SET	items = FLOOR(activityPoints / ?)
-	WHERE	objectTypeID = ?";
-$statement = WCF::getDB()->prepareStatement($sql);
-
-foreach (ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.user.activityPointEvent') as $objectType) {
-	// prevent division by zero
-	if (!$objectType->points) {
-		continue;
-	}
-	
-	$statement->execute(array(
-		$objectType->points,
-		$objectType->objectTypeID
-	));
-}
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index f1da011002..44e6bcf58e 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -35,7 +35,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.0.0 Beta 5 (Maelstrom)');
+define('WCF_VERSION', '2.0.0 Beta 6 (Maelstrom)');
 
 // define current unix timestamp
 define('TIME_NOW', time());
-- 
2.20.1