Run the article clean up script earlier

diff --git a/com.woltlab.wcf/files_pre_check.tar b/com.woltlab.wcf/files_pre_check.tar
index 9c2ddaae91cd91adce9d1952bd75371de41ef953..bcd5a8c02a364343f0f6a1ec541a5628b08cfbb6 100644 (file)
Binary files a/com.woltlab.wcf/files_pre_check.tar and b/com.woltlab.wcf/files_pre_check.tar differ

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index f0fb63646983c593c14fbb42518445f71a8db9e0..81e9edd1374c10f6a07f19265d49680ed1675aa5 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -53,6 +53,7 @@
        <instructions type="update" fromversion="5.5.*">
                <!--
 tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
+       acp/update_com.woltlab.wcf_6.0_articleOrphans.php \
        acp/update_com.woltlab.wcf_6.0_checkSystemRequirements.php \
        acp/update_com.woltlab.wcf_6.0_checkCache.php \
        acp/update_com.woltlab.wcf_6.0_checkAttachmentStorage.php \
@@ -82,6 +83,9 @@ tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
                <!-- Set up an empty bootstrap file if its does not exist. -->
                <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_initBootstrap.php</instruction>
 
+               <!-- Run before the new code, because some plugins are triggered that would be incompatible. -->
+               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_articleOrphans.php</instruction>
+
                <!-- Deploy new application code. -->
                <instruction type="file" />
                <instruction type="acpTemplate" />
@@ -94,9 +98,6 @@ tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
                <!-- Run before the database migrations, because the data is gone otherwise. -->
                <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_landingPage.php</instruction>
 
-               <!-- Run before the database migrations, because otherwise the migration fails. -->
-               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_articleOrphans.php</instruction>
-
                <!-- Migrate the database as early as possible. -->
                <instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.0_reaction_fk_step1.php</instruction>
                <instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.0_reaction_fk_step2.php</instruction>