From 43629d79e61a06a69e0d49412920b3511f52667f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Thu, 19 Nov 2020 16:09:29 +0100
Subject: [PATCH] Fix style preview images when upgrading from 5.2

---
 com.woltlab.wcf/package.xml                   |  2 +-
 ..._com.woltlab.wcf_5.3.1_faviconTemplate.php | 29 ----------
 .../update_com.woltlab.wcf_5.3.1_style.php    | 53 +++++++++++++++++++
 .../acp/update_com.woltlab.wcf_5.3_style.php  | 10 ++--
 4 files changed, 60 insertions(+), 34 deletions(-)
 delete mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.1_faviconTemplate.php
 create mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.1_style.php

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index cf409de0b5..2c033b692b 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -103,7 +103,7 @@
 	</instructions>
 	
 	<!-- Run the option.xml update for 5.3.0 -> 5.3.1, due to the missing removal of external_link_rel_nofollow. -->
-	<!-- Run update_com.woltlab.wcf_5.3.1_faviconTemplate.php for 5.3.0 -> 5.3.1 -->
+	<!-- Run update_com.woltlab.wcf_5.3.1_style.php for 5.3.0 -> 5.3.1 -->
 	<!-- Add a note about the updated CSS in email_html.tpl to the release notes:
 		https://github.com/WoltLab/WCF/commit/1ac55ad408d5bfab4f69714c6259cc5d09ceb344
 		Administrators are highly encouraged to apply the CSS adjustments to their custom template version.
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.1_faviconTemplate.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.1_faviconTemplate.php
deleted file mode 100644
index 79465a3497..0000000000
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.1_faviconTemplate.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-use wcf\data\style\StyleList;
-
-/**
- * @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) {
-	foreach ([
-		'gif',
-		'jpeg',
-		'jpg',
-		'png',
-	] as $extension) {
-		if (file_exists($style->getAssetPath() . 'favicon.template.' . $extension)) {
-			rename(
-				$style->getAssetPath() . 'favicon.template.' . $extension,
-				$style->getAssetPath() . 'favicon-template.' . $extension
-			);
-		}
-	}
-}
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.1_style.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.1_style.php
new file mode 100644
index 0000000000..535706b4b9
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3.1_style.php
@@ -0,0 +1,53 @@
+<?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 name of the favicon template.
+	foreach ([
+		'gif',
+		'jpeg',
+		'jpg',
+		'png',
+	] as $extension) {
+		if (file_exists($style->getAssetPath() . 'favicon.template.' . $extension)) {
+			rename(
+				$style->getAssetPath() . 'favicon.template.' . $extension,
+				$style->getAssetPath() . 'favicon-template.' . $extension
+			);
+		}
+	}
+	
+	// Fix the style preview.
+	if (
+		$style->image === basename($style->image) &&
+		file_exists($style->getAssetPath() . $style->image)
+	) {
+		$styleEditor->update([
+			'image' => FileUtil::getRelativePath(WCF_DIR.'images/', $style->getAssetPath()) . $style->image,
+		]);
+	}
+	
+	if (
+		$style->image2x === basename($style->image2x) &&
+		file_exists($style->getAssetPath() . $style->image2x)
+	) {
+		$styleEditor->update([
+			'image2x' => FileUtil::getRelativePath(WCF_DIR.'images/', $style->getAssetPath()) . $style->image2x,
+		]);
+	}
+}
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3_style.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3_style.php
index 27fe4cfe2b..888aea40a0 100644
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3_style.php
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.3_style.php
@@ -81,23 +81,25 @@ foreach ($styleList as $style) {
 	// Moving *should* be safe here, unless the admin manually edited the style, but better play safe.
 	if ($style->image && file_exists(WCF_DIR . 'images/' . $style->image)) {
 		$extension = pathinfo($style->image, PATHINFO_EXTENSION);
+		$newName =  'stylePreview.' . $extension;
 		copy(
 			WCF_DIR . 'images/' . $style->image,
-			$style->getAssetPath() . 'stylePreview.' . $extension
+			$style->getAssetPath() . $newName
 		);
 		$styleEditor->update([
-			'image' => 'stylePreview.' . $extension,
+			'image' => FileUtil::getRelativePath(WCF_DIR.'images/', $style->getAssetPath()) . $newName,
 		]);
 	}
 
 	if ($style->image2x && file_exists(WCF_DIR . 'images/' . $style->image2x)) {
 		$extension = pathinfo($style->image2x, PATHINFO_EXTENSION);
+		$newName = 'stylePreview@2x.' . $extension;
 		copy(
 			WCF_DIR . 'images/' . $style->image2x,
-			$style->getAssetPath() . 'stylePreview@2x.' . $extension
+			$style->getAssetPath() . $newName
 		);
 		$styleEditor->update([
-			'image2x' => 'stylePreview@2x.' . $extension,
+			'image2x' => FileUtil::getRelativePath(WCF_DIR.'images/', $style->getAssetPath()) . $newName,
 		]);
 	}
 	
-- 
2.20.1