From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 30 Jul 2013 15:29:57 +0000 (+0200)
Subject: Preparing update 2.0.0 Beta 6
X-Git-Tag: 2.0.0_Beta_6^0
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0d24c83ed02f21ace46e5f09cd2e667331612d62;p=GitHub%2FWoltLab%2FWCF.git

Preparing update 2.0.0 Beta 6
---

diff --git a/com.woltlab.wcf/files_pre_update.tar b/com.woltlab.wcf/files_pre_update.tar
deleted file mode 100644
index d62904a47b..0000000000
Binary files a/com.woltlab.wcf/files_pre_update.tar and /dev/null differ
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());