From fd8f7cbc88f3e204fb0b00e9c3dc78f654249a8d Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 29 Aug 2020 23:37:42 +0200
Subject: [PATCH] Resolved some issues during the upgrade, first successful
 upgrade

---
 com.woltlab.wcf/files_pre.tar | Bin 4907008 -> 4910080 bytes
 com.woltlab.wcf/package.xml   |  21 ++++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/com.woltlab.wcf/files_pre.tar b/com.woltlab.wcf/files_pre.tar
index 87e6a520ae2dd64c63bf1405fc4b3a6709e80763..7d79221d99332885d3a9472db18efb9bf5ca0ea7 100644
GIT binary patch
delta 2628
zcmbVO&vV;E6pouhk&A&)%FhzE5U`xaj{GYo4oyStq?m>zOq_NYobf2q+FmM4Mp`xX
zNj<zHmrfaS<J22}09W`AIC9_*;Ra7D%Z{i`+<L~Ay}R#w-+S+SZ~gGMU(P-J6W<Vn
zb1)0%;RSdRF2GA5K^!i^%aDLq;8l1H=HPX>1aH7)coW`&x8WUl7v6&_@IK7L2SDH|
zd<Y-G0(=agKoVp~!6ICPB}hXCmO+6m<RA|PD8dSq;8R$IGOWR8a2?j+25i9Ra1$y}
zg-zIkTkr+co_zV&tg7`+u3ouTc|_({6-6l(i)7}%FI*2_GueD8mn#;EIb~%A7mK-k
zai(}OC&ly&uESNEkdyC8{O@_hU3PoA%4t)xx|w6k;D&mXIo4XuVkUo*{b4r$h+Ohr
zt`rIrT^7(&;Igoy<nvi{na!<~N;AsSE`RzXCV8$y3HoR_eTUO-1O2N<szV$2Fla-w
z47Y1GDjn6X4tDDPMn$ZzCE`<=*GxXi+MB}rS5#+im(vFmQKkUdvG|T_7)T|noFd~r
zYb*ntJF2Z=QnIVrQ((`EwR`lPM>Ss4p9dpib7mzXr?H%7o9@|`Mm@)|>@%&IsnZ9I
z2*#FWQ`R<b)Bf{V*L*<V@J3XAJypA>wrQhhxNT-O_BEUJ_+GGBGqGI^L*>je_ryK|
zJpO&|vX_W2FD@qHWRV<*2671RP@)e6ON5k(q4q78la_6D$z5!&ZS{!kyNpv(!B9vs
zlOx>1M?NEv#7BL%x?3i$$tgC6zC?N!rzU5}qEDEKZQ3&^r=^j>hU)T;WlLLzWi!<z
zw^U|`-3`s^^=;Pfa4Cl^na(LW<?-72ACdcl;OCI*<l97CiX^#Q)@+IsK~7?eW}7;_
z&n?SvnqB5N%xpIetfPzhYGN4OWD3ot^m@><j_jjJ5^8Lc#C&uwfcNcd)nsZ(*o^Pj
z5t-2K$YPqV7-P?=hqMEy6B;z^sngaDud^-<4gYsMjLc9x+P%81YG^2;#8jD<C#Hfd
zRt^UVM71-Gh6#)mMCf*iImF@p9+k%(JlLsyeX!ZAf3vqaJUpyV67%SZ`e7oMi2pPA
z<rniXNK446HEg%Byhh#lG`Wbs&|QElNnU#0rY&kyQ=_^V?E|faWJbvvoeQQv5*bmh
zBH=KrmRY5KU&zV*%{tjR*xn96f{-F<Dtl3dcX8CK<Apr6K3dG6!5j!w64KIXOLYx?
zM>Sk3D}wD|%Jan+r4(g^7o0tw(1c5ISb!w$V)s`pv&C$TYm`WXnr+^Z3qA)=lEM;C
zExV-8$yEIg2xEIr0lJPiKpM&o^KpoCH4&FhdQ2jjIdyILw}vdnF4?$`|6$G;)MSBo
zm_rtqk+1lgUT48Hzb(djdc94<F)s_@4~C*&ox7E-avArlH|3N#xT!Oa?o${&F7*6s
U%yHz@+OM(si~qz<h!p$zUk|cT!vFvP

delta 173
zcmXBENjic7007XhLS%?kB=LvPXsArlpb)2O@h;FE+Btx&V_39sl={9F?~VSx!=v9h
zAz=|qmaT|dwI*iWhD}@Iw(UsRm6VdUXJ5vFtV20Rjs@~goH|o*?!u*_lCp}bnk(0C
q+^TD6x^wTrqbDuTUbJ;|^}OmEc=PVV(C6f9`V%C3|Dna>pgRMFBs+Nk

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 42a73de5d9..f3ea210b97 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -55,16 +55,16 @@
 		     Guzzle can not be found during the development of the regular file PIP. -->
 		<instruction type="file" run="standalone">files_pre.tar</instruction>
 		
+		<!-- Deploy the database changes as early as possible to avoid any conflicts by calls to
+		     tables that do not exist in 5.2, in particular `wcfN_devtools_missing_language_item`.-->
+		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3.php</instruction>
+		
 		<instruction type="file" />
 		<instruction type="acpTemplate" />
 		<instruction type="template" />
 		
 		<instruction type="option" run="standalone" />
 		
-		<instruction type="script">acp/update_com.woltlab.wcf_5.3.php</instruction>
-		<instruction type="script">acp/update_com.woltlab.wcf_5.3_invalidateMailForm.php</instruction>
-		<instruction type="sql">update_5.3.sql</instruction>
-		
 		<instruction type="acpMenu" />
 		<instruction type="clipboardAction" />
 		<instruction type="mediaProvider" />
@@ -72,12 +72,17 @@
 		<instruction type="userMenu" />
 		<instruction type="page" />
 		
+		<!-- TODO: Verify that this step is idempotent! -->
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3_style.php</instruction>
+		
 		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3_emailConfirmation.php</instruction>
 		
+		<!-- The internal data structure of sitemaps have been modified, this script must be run before
+		     the `objectType` pip to prevent any data corruption. -->
+		<instruction type="script">acp/update_com.woltlab.wcf_5.3_sitemaps.php</instruction>
+		
 		<instruction type="objectTypeDefinition" />
 		<instruction type="objectType" />
-		<instruction type="script">acp/update_com.woltlab.wcf_5.3_sitemaps.php</instruction>
 		
 		<instruction type="userNotificationEvent" />
 		<instruction type="userOption" />
@@ -85,5 +90,11 @@
 		<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>
+		
+		<!-- 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>
 	</instructions>
 </package>
-- 
2.20.1