From 9bbaf87abdef0c7e4310c304b4715c37893c3081 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Thu, 26 Nov 2020 14:18:56 +0100
Subject: [PATCH] Update the upgrade instructions from WoltLab Suite 5.3

- A few PIPs were missing, most notably the language items.
- Additional commentary.
- Reordering for better resiliency.
---
 com.woltlab.wcf/package.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 20340eccf5..a69365f825 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -63,24 +63,40 @@ tar cvf com.woltlab.wcf/files_pre.tar -C wcfsetup/install/files/ \
 		-->
 		<instruction type="file" run="standalone">files_pre.tar</instruction>
 		
+		<!-- Checks that need to happen before the upgrade starts. -->
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_checkOwnerGroup.php</instruction>
 		
+		<!-- Preparations for the new session system. -->
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_session_1_cookies.php</instruction>
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_session_2_user_session.php</instruction>
 		
+		<!-- New application code. -->
 		<instruction type="file" skipStyleUpdate="true" />
 		<instruction type="acpTemplate" />
 		<instruction type="template" />
 		
+		<!-- Make the new options available as early as possible. -->
+		<instruction type="option" run="standalone" />
+		
+		<!-- Cleanup for the new session system. -->
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_session_3_drop_virtual.php</instruction>
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_session_4_clean_session.php</instruction>
+		
+		<!-- Non-critical database adjustments. -->
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_db.php</instruction>
 		
+		<!-- Cleanup of the filesystem. -->
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_removeFiles.php</instruction>
 		
+		<!-- Update of the styles that was skipped during the deployment of the new application code. -->
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_updateStyle.php</instruction>
 		
+		<!-- Misc. PIPs. -->
 		<instruction type="objectTypeDefinition" />
-		<instruction type="option" />
+		<instruction type="objectType" />
+		<instruction type="userGroupOption" />
+		<instruction type="userMenu" />
+		<instruction type="page" />
+		<instruction type="language" />
 	</instructions>
 </package>
-- 
2.20.1