From b3cb525f0d3bb569f72e6733d7db68522d234d9f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Mon, 12 Apr 2021 12:09:58 +0200
Subject: [PATCH] Add the update of wcf1_event_listener to
 update_com.woltlab.wcf_5.3.php
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

… and restore update_com.woltlab.wcf_5.3.3_db.php for the users that upgraded
from 5.2.x to 5.3.3+.
---
 com.woltlab.wcf/package.xml                   | 11 ++-----
 .../acp/update_com.woltlab.wcf_5.3.3_db.php   | 30 +++++++++++++++++++
 .../files/acp/update_com.woltlab.wcf_5.3.php  |  6 ++++
 3 files changed, 38 insertions(+), 9 deletions(-)
 create mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.3_db.php

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 14f1210d5f..6e8dcbc8c2 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -106,14 +106,7 @@
 		<instruction type="script">acp/update_com.woltlab.wcf_5.3_packageServer.php</instruction>
 	</instructions>
 
-	<instructions type="update" fromversion="5.3.4">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
-		<instruction type="file">files_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
-		
-		<instruction type="language" />
-		
-		<instruction type="mediaProvider" />
-		<instruction type="objectType" />
+	<instructions type="update" fromversion="5.3.5">
+		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3.3_db.php</instruction>
 	</instructions>
 </package>
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.3_db.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.3_db.php
new file mode 100644
index 0000000000..387d26ac8a
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.3_db.php
@@ -0,0 +1,30 @@
+<?php
+
+use wcf\system\database\table\column\EnumDatabaseTableColumn;
+use wcf\system\database\table\DatabaseTableChangeProcessor;
+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.3.2 to 5.3.3.
+ *
+ * @author  Matthias Schmidt
+ * @copyright   2001-2021 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ */
+
+$tables = [
+	PartialDatabaseTable::create('wcf1_event_listener')
+		->columns([
+			EnumDatabaseTableColumn::create('environment')
+				->enumValues(['user', 'admin', 'all'])
+		]),
+];
+
+(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.3.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.php
index b70f5140ed..c77c206d11 100644
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.php
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.php
@@ -1,6 +1,7 @@
 <?php
 
 use wcf\system\database\table\column\CharDatabaseTableColumn;
+use wcf\system\database\table\column\EnumDatabaseTableColumn;
 use wcf\system\database\table\column\IntDatabaseTableColumn;
 use wcf\system\database\table\column\MediumtextDatabaseTableColumn;
 use wcf\system\database\table\column\NotNullInt10DatabaseTableColumn;
@@ -53,6 +54,11 @@ $tables = [
 				->referencedColumns(['languageID'])
 				->onDelete('SET NULL')
 		]),
+	PartialDatabaseTable::create('wcf1_event_listener')
+		->columns([
+			EnumDatabaseTableColumn::create('environment')
+				->enumValues(['user', 'admin', 'all'])
+		]),
 	PartialDatabaseTable::create('wcf1_media')
 		->columns([
 			NotNullInt10DatabaseTableColumn::create('fileUpdateTime')
-- 
2.20.1