Fix the pre update script for the bootstrapper

diff --git a/com.woltlab.wcf/files_pre_check.tar b/com.woltlab.wcf/files_pre_check.tar
index 026c8fcc11100e80f1bdfe8b345bb2fcd8c3b9cf..9c2ddaae91cd91adce9d1952bd75371de41ef953 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 96124142baa8a5ab2be29377258715cd661543bd..09ec6cafcb23b8ba6b92c8cbb9a09264df8f3eb7 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -57,10 +57,11 @@ tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
        acp/update_com.woltlab.wcf_6.0_checkCache.php \
        acp/update_com.woltlab.wcf_6.0_checkAttachmentStorage.php \
        acp/update_com.woltlab.wcf_6.0_checkForMultiDomainSetup.php \
+       acp/update_com.woltlab.wcf_6.0_checkUpdateServers.php \
+       acp/update_com.woltlab.wcf_6.0_initBootstrap.php \
        acp/update_com.woltlab.wcf_6.0_styleVariables.php \
        acp/database/update_com.woltlab.wcf_6.0_pre.php \
-       acp/database/update_com.woltlab.wcf_6.0_style.php \
-       acp/update_com.woltlab.wcf_6.0_checkUpdateServers.php
+       acp/database/update_com.woltlab.wcf_6.0_style.php
                -->
                <instruction type="file" run="standalone">files_pre_check.tar</instruction>
 

diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.0_initBootstrap.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.0_initBootstrap.php
index b4d26215163f7ff6d81a68f2fe590a488b4925a0..9bce40dded5c437b1c4e54c95ee4ed39e4e2e22d 100644 (file)
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.0_initBootstrap.php
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.0_initBootstrap.php
@@ -12,13 +12,15 @@
 namespace wcf\acp;
 
 use wcf\system\io\AtomicWriter;
-use wcf\system\WCF;
 
-if (\file_exists(WCF::BOOTSTRAP_LOADER)) {
+// Variable taken from 'WCF::BOOTSTRAP_LOADER' which is not defined yet.
+$BOOTSTRAP_LOADER = \WCF_DIR . '/lib/bootstrap.php';
+
+if (\file_exists($BOOTSTRAP_LOADER)) {
     return;
 }
 
-$writer = new AtomicWriter(WCF::BOOTSTRAP_LOADER);
+$writer = new AtomicWriter($BOOTSTRAP_LOADER);
 $writer->write(
     <<<'EOT'
         <?php