From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Tue, 13 Oct 2020 09:58:01 +0000 (+0200)
Subject: Update defaultStyle after migrating styles
X-Git-Tag: 5.3.0_RC_2~18^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c32b452772e47d11cf6e4a34a5091dc23efeccdf;p=GitHub%2FWoltLab%2FWCF.git

Update defaultStyle after migrating styles

It appears that importing the defaultStyle causes the style specific asset folder to be created, leading to issues with the style migration.
---

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 1672b5822b..ee933824b3 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -87,14 +87,14 @@
 		<instruction type="userNotificationEvent" />
 		<instruction type="userOption" />
 		
-		<instruction type="style" run="standalone">defaultStyle.tar</instruction>
-		
 		<instruction type="language" />
 		
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3_invalidateMailForm.php</instruction>
 		
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3_style.php</instruction>
 		
+		<instruction type="style" run="standalone">defaultStyle.tar</instruction>
+		
 		<!-- This SQL step purges the legacy package servers, this must come last to make sure that an early
 		     abort of the core upgrade does not brick the installation. -->
 		<instruction type="sql">update_5.3.sql</instruction>