From 1803f0a9228ff0c20383ca3434b4794b33109f90 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 29 Nov 2019 15:28:13 +0100
Subject: [PATCH] Preparing the release 5.2.0 Beta 4

---
 com.woltlab.wcf/package.xml                   | 11 +++---
 .../update-com.woltlab.wcf_5.2.0_beta_2.php   | 36 -------------------
 .../update-com.woltlab.wcf_5.2.0_beta_3.php   | 34 ------------------
 .../install/files/lib/system/WCF.class.php    |  2 +-
 4 files changed, 5 insertions(+), 78 deletions(-)
 delete mode 100644 wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.0_beta_2.php
 delete mode 100644 wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.0_beta_3.php

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 648e55bd68..a9c2854c8d 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>5.2.0 Beta 3</version> <!-- codename: hurricane -->
-		<date>2019-11-15</date>
+		<version>5.2.0 Beta 4</version> <!-- codename: hurricane -->
+		<date>2019-11-29</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -50,13 +50,10 @@
 		<instruction type="script">acp/post_install.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="5.2.0 Beta 2">
+	<instructions type="update" fromversion="5.2.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="script">acp/update-com.woltlab.wcf_5.2.0_beta_3.php</instruction>
-		
-		<instruction type="language" />
+		<instruction type="page" />
 	</instructions>
 </package>
diff --git a/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.0_beta_2.php b/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.0_beta_2.php
deleted file mode 100644
index 6a573118b8..0000000000
--- a/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.0_beta_2.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-use wcf\system\database\table\column\DefaultFalseBooleanDatabaseTableColumn;
-use wcf\system\database\table\column\DefaultTrueBooleanDatabaseTableColumn;
-use wcf\system\database\table\column\NotNullVarchar255DatabaseTableColumn;
-use wcf\system\database\table\DatabaseTable;
-use wcf\system\database\table\DatabaseTableChangeProcessor;
-use wcf\system\package\plugin\ScriptPackageInstallationPlugin;
-use wcf\system\WCF;
-
-/**
- * Updates the database table layout from WoltLab Suite Core 5.2.0 Beta 1 to 5.2.0 Beta 2
- * 
- * @author	Alexander Ebert, Matthias Schmidt
- * @copyright	2001-2019 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- */
-
-$tables = [
-	DatabaseTable::create('wcf1_reaction_type')
-		->columns([
-			NotNullVarchar255DatabaseTableColumn::create('title'),
-			NotNullVarchar255DatabaseTableColumn::create('iconFile')
-				->defaultValue(''),
-			DefaultTrueBooleanDatabaseTableColumn::create('isAssignable'),
-			
-			DefaultFalseBooleanDatabaseTableColumn::create('isDisabled')
-				->drop()
-		]),
-];
-
-(new DatabaseTableChangeProcessor(
-	/** @var ScriptPackageInstallationPlugin $this */
-	$this->installation->getPackage(),
-	$tables,
-	WCF::getDB()->getEditor())
-)->process();
diff --git a/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.0_beta_3.php b/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.0_beta_3.php
deleted file mode 100644
index dee5ddc892..0000000000
--- a/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2.0_beta_3.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-use wcf\system\database\table\DatabaseTableChangeProcessor;
-use wcf\system\database\table\index\DatabaseTableIndex;
-use wcf\system\database\table\PartialDatabaseTable;
-use wcf\system\package\plugin\ScriptPackageInstallationPlugin;
-use wcf\system\WCF;
-
-/**
- * Updates the database table layout from WoltLab Suite Core 5.2.0 Beta 2 to 5.2.0 Beta 3.
- *
- * @author	Matthias Schmidt
- * @copyright	2001-2019 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- */
-
-$tables = [
-	PartialDatabaseTable::create('wcf1_package')
-		->indices([
-			DatabaseTableIndex::create('package')
-				->columns(['package'])
-				->drop(),
-			
-			DatabaseTableIndex::create()
-				->type(DatabaseTableIndex::UNIQUE_TYPE)
-				->columns(['package'])
-		])
-];
-
-(new DatabaseTableChangeProcessor(
-/** @var ScriptPackageInstallationPlugin $this */
-	$this->installation->getPackage(),
-	$tables,
-	WCF::getDB()->getEditor())
-)->process();
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index db8d1c4789..1283fd8c44 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -49,7 +49,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '5.2.0 Beta 3');
+define('WCF_VERSION', '5.2.0 Beta 4');
 
 // define current API version
 // @deprecated 5.2
-- 
2.20.1