Deploy the INTERNAL_HOSTNAMES option before deploying files

Resolves #4065

diff --git a/com.woltlab.wcf/option_5.4.xml b/com.woltlab.wcf/option_5.4.xml
new file mode 100644 (file)
index 0000000..1db06c0
--- /dev/null
+++ b/com.woltlab.wcf/option_5.4.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/2019/option.xsd">
+       <import>
+               <options>
+                       <option name="internal_hostnames">
+                               <categoryname>general.page</categoryname>
+                               <optiontype>textarea</optiontype>
+                       </option>
+               </options>
+       </import>
+</data>

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index da1f40f5d53faab02e1bb5fa0f6e830c282a4a29..712c051f956dc7448d267f233f73581ca07ff593 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -73,6 +73,9 @@ tar cvf com.woltlab.wcf/files_pre.tar -C wcfsetup/install/files/ \
        lib/system/package/plugin/FilePackageInstallationPlugin.class.php
                -->
                <instruction type="file" run="standalone">files_pre.tar</instruction>
+               
+               <!-- Deploy some of the options before running the upgrade to not brick the login if the upgrade aborts. -->
+               <instruction type="option" run="standalone">option_5.4.xml</instruction>
 
                <!-- Preparations for the new session system. -->
                <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_session_1_cookies.php</instruction>
@@ -84,7 +87,7 @@ tar cvf com.woltlab.wcf/files_pre.tar -C wcfsetup/install/files/ \
                <instruction type="acpTemplate" />
                <instruction type="template" />
                
-               <!-- Make the new options available as early as possible. -->
+               <!-- Make all the new options available as early as possible. -->
                <instruction type="option" run="standalone" />
                
                <!-- Cleanup for the new session system. -->