From 9acb650140ac53a50b2ef5f3be1c8434ad14db12 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 9 Nov 2017 13:23:25 +0100
Subject: [PATCH] Preparing release 3.1.0 Beta 3

---
 com.woltlab.wcf/package.xml                   | 12 ++++--
 com.woltlab.wcf/update_3.1.0_beta_1.sql       | 20 ----------
 com.woltlab.wcf/update_3.1.0_beta_3.sql       | 14 +++++++
 .../update_com.woltlab.wcf_beta1_to_beta2.php | 38 -------------------
 .../install/files/lib/system/WCF.class.php    |  2 +-
 5 files changed, 23 insertions(+), 63 deletions(-)
 delete mode 100644 com.woltlab.wcf/update_3.1.0_beta_1.sql
 create mode 100644 com.woltlab.wcf/update_3.1.0_beta_3.sql
 delete mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_beta1_to_beta2.php

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index cd32c57670..45ed432421 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.1.0 Beta 2</version> <!-- codename: tornado -->
-		<date>2017-10-25</date>
+		<version>3.1.0 Beta 3</version> <!-- codename: tornado -->
+		<date>2017-11-10</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -48,16 +48,20 @@
 		<instruction type="script">acp/post_install.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="3.1.0 Beta 1">
+	<instructions type="update" fromversion="3.1.0 Beta 2">
 		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 		<instruction type="file">files_update.tar</instruction>
 		<instruction type="template">templates_update.tar</instruction>
 		
+		<instruction type="sql" run="standalone">update_3.1.0_beta_3.sql</instruction>
+		
 		<instruction type="language" />
 		
+		<instruction type="acpMenu" />
 		<instruction type="mediaProvider" />
+		<instruction type="objectType" />
 		<instruction type="option" />
 		
-		<instruction type="script">acp/update_com.woltlab.wcf_beta1_to_beta2.php</instruction>
+		<instruction type="style">defaultStyle.tar</instruction>
 	</instructions>
 </package>
diff --git a/com.woltlab.wcf/update_3.1.0_beta_1.sql b/com.woltlab.wcf/update_3.1.0_beta_1.sql
deleted file mode 100644
index dd70dc73ed..0000000000
--- a/com.woltlab.wcf/update_3.1.0_beta_1.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-DROP TABLE IF EXISTS wcf1_package_compatibility;
-CREATE TABLE wcf1_package_compatibility (
-	packageID INT(10) NOT NULL,
-	version SMALLINT(4) NOT NULL,
-	UNIQUE KEY compatibleVersion (packageID, version)
-);
-
-DROP TABLE IF EXISTS wcf1_package_update_compatibility;
-CREATE TABLE wcf1_package_update_compatibility (
-	packageUpdateVersionID INT(10) NOT NULL,
-	version SMALLINT(4) NOT NULL,
-	UNIQUE KEY compatibleVersion (packageUpdateVersionID, version)
-);
-
-ALTER TABLE wcf1_package_compatibility ADD FOREIGN KEY (packageID) REFERENCES wcf1_package (packageID) ON DELETE CASCADE;
-
-ALTER TABLE wcf1_package_update_compatibility ADD FOREIGN KEY (packageUpdateVersionID) REFERENCES wcf1_package_update_version (packageUpdateVersionID) ON DELETE CASCADE;
-
-INSERT INTO wcf1_package_update_server (serverURL, status, isDisabled, errorMessage, lastUpdateTime, loginUsername, loginPassword) VALUES ('http://update.woltlab.com/tornado/', 'online', 0, NULL, 0, '', '');
-INSERT INTO wcf1_package_update_server (serverURL, status, isDisabled, errorMessage, lastUpdateTime, loginUsername, loginPassword) VALUES ('http://store.woltlab.com/tornado/', 'online', 0, NULL, 0, '', '');
diff --git a/com.woltlab.wcf/update_3.1.0_beta_3.sql b/com.woltlab.wcf/update_3.1.0_beta_3.sql
new file mode 100644
index 0000000000..196658f6c1
--- /dev/null
+++ b/com.woltlab.wcf/update_3.1.0_beta_3.sql
@@ -0,0 +1,14 @@
+ALTER TABLE wcf1_comment_response ADD COLUMN enableHtml TINYINT(1) NOT NULL DEFAULT 0;
+
+ALTER TABLE wcf1_style ADD COLUMN image2x VARCHAR(255) NOT NULL DEFAULT '';
+
+DROP TABLE IF EXISTS wcf1_registry;
+CREATE TABLE wcf1_registry (
+	packageID INT(10) NOT NULL,
+	field VARCHAR(191) NOT NULL,
+	fieldValue MEDIUMTEXT,
+	
+	UNIQUE KEY uniqueField (packageID, field)
+);
+
+ALTER TABLE wcf1_registry ADD FOREIGN KEY (packageID) REFERENCES wcf1_package (packageID) ON DELETE CASCADE;
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_beta1_to_beta2.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_beta1_to_beta2.php
deleted file mode 100644
index fd1c1e9bd1..0000000000
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_beta1_to_beta2.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-use wcf\data\condition\ConditionEditor;
-use wcf\data\condition\ConditionList;
-
-/**
- * Rewrites the condition data from userTrophy to userTrophyIDs to make it more consistent.
- * The rewrite is only needed if the Core is updated from 3.1.0 Beta 1 to 3.1.0 Beta 2.
- * 
- * @author	Joshua Ruesweg
- * @copyright	2001-2017 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	WoltLabSuite\Core
- */
-$conditionList = new ConditionList();
-$conditionList->readObjects();
-
-foreach ($conditionList->getObjects() as $condition) {
-	if ($condition->userTrophy !== null || $condition->notUserTrophy !== null) {
-		$conditionData = $condition->conditionData;
-		
-		if (isset($conditionData['userTrophy'])) {
-			$conditionData['userTrophyIDs'] = $conditionData['userTrophy'];
-			unset($conditionData['userTrophy']);
-		}
-		
-		if (isset($conditionData['notUserTrophy'])) {
-			$conditionData['notUserTrophyIDs'] = $conditionData['notUserTrophy'];
-			unset($conditionData['notUserTrophy']);
-		}
-		
-		$editor = new ConditionEditor($condition);
-		$editor->update([
-			'conditionData' => serialize($conditionData)
-		]);
-	}
-}
-
-ConditionEditor::resetCache();
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index a373189bbe..3b1c8569b4 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -48,7 +48,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '3.1.0 Beta 2');
+define('WCF_VERSION', '3.1.0 Beta 3');
 
 // define current API version
 define('WSC_API_VERSION', 2018);
-- 
2.20.1