From 5f63c08496175594c92dc6be91ebff2d76e78396 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 1 Feb 2021 13:07:47 +0100
Subject: [PATCH] Release 5.3.4

---
 com.woltlab.wcf/package.xml                   | 15 +---
 .../acp/update_com.woltlab.wcf_5.3.3_db.php   | 30 -------
 .../update_com.woltlab.wcf_5.3.3_style.php    | 88 -------------------
 .../install/files/lib/system/WCF.class.php    |  2 +-
 4 files changed, 4 insertions(+), 131 deletions(-)
 delete mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.3_db.php
 delete mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.3_style.php

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 93abc364f7..83b3f025cd 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.3.3</version>
-		<date>2021-01-29</date>
+		<version>5.3.4</version>
+		<date>2021-02-01</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -105,17 +105,8 @@
 		
 		<instruction type="script">acp/update_com.woltlab.wcf_5.3_packageServer.php</instruction>
 	</instructions>
-	
-	<!-- Run update_com.woltlab.wcf_5.3.3_style.php for 5.3.2 -> 5.3.3 -->
-	<!-- Run update_com.woltlab.wcf_5.3.3_db.php for 5.3.2 -> 5.3.3 -->
 
-	<instructions type="update" fromversion="5.3.2">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+	<instructions type="update" fromversion="5.3.3">
 		<instruction type="file">files_update.tar</instruction>
-
-		<instruction type="language" />
-
-		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3.3_style.php</instruction>
-		<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
deleted file mode 100644
index 387d26ac8a..0000000000
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.3_db.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.3_style.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.3_style.php
deleted file mode 100644
index 83213d63ce..0000000000
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.3_style.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-use wcf\data\style\StyleEditor;
-use wcf\data\style\StyleList;
-use wcf\util\FileUtil;
-
-/**
- * @author	Tim Duesterhus
- * @copyright	2001-2020 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	WoltLabSuite\Core
- */
-
-$styleList = new StyleList();
-$styleList->readObjects();
-
-foreach ($styleList as $style) {
-	$styleEditor = new StyleEditor($style);
-	
-	// Fix the style preview.
-	if (!$style->image) {
-		$basename = 'stylePreview';
-		
-		// Check all possible extensions for preview images on the file system.
-		$files = [];
-		foreach ([
-			'png',
-			'gif',
-			'jpg',
-			'jpeg',
-			'svg',
-		] as $extension) {
-			$fileName = $style->getAssetPath().$basename.'.'.$extension;
-			if (is_readable($fileName)) {
-				$files[$extension] = filemtime($fileName);
-			}
-		}
-		
-		// Sort by modification time in descending order.
-		arsort($files);
-		
-		if (!empty($files)) {
-			// This loop will pick the newest file first.
-			foreach ($files as $extension => $unused) {
-				$newName = $basename.'.'.$extension;
-				
-				$styleEditor->update([
-					'image' => FileUtil::getRelativePath(WCF_DIR.'images/', $style->getAssetPath()).$newName,
-				]);
-				
-				// break after handling the newest file, simulating
-				// array_key_first().
-				break;
-			}
-		}
-	}
-	
-	if (!$style->image2x) {
-		$basename = 'stylePreview@2x';
-		
-		$files = [];
-		foreach ([
-			'png',
-			'gif',
-			'jpg',
-			'jpeg',
-			'svg',
-		] as $extension) {
-			$fileName = $style->getAssetPath().$basename.'.'.$extension;
-			if (is_readable($fileName)) {
-				$files[$extension] = filemtime($fileName);
-			}
-		}
-		arsort($files);
-		
-		if (!empty($files)) {
-			foreach ($files as $extension => $unused) {
-				$newName = $basename.'.'.$extension;
-				
-				$styleEditor->update([
-					'image2x' => FileUtil::getRelativePath(WCF_DIR.'images/', $style->getAssetPath()).$newName,
-				]);
-				
-				break;
-			}
-		}
-	}
-}
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index b2674cce1c..e5bfce978b 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -51,7 +51,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '5.3.3');
+define('WCF_VERSION', '5.3.4');
 
 // define current API version
 // @deprecated 5.2
-- 
2.20.1