From 981505fe440824a36e76f338baeec1df87affa2d Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 19 Jul 2019 11:58:56 +0200
Subject: [PATCH] Import the new options first

---
 com.woltlab.wcf/files_reloadOptions.tar          | Bin 0 -> 2560 bytes
 com.woltlab.wcf/package.xml                      |   6 +++++-
 ...pdate-com.woltlab.wcf_5.2_reactionUpdate.php} |   0
 .../update-com.woltlab.wcf_5.2_reloadOptions.php |   5 +++++
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 com.woltlab.wcf/files_reloadOptions.tar
 rename wcfsetup/install/files/acp/{update-com.woltlab.wcf_3.2_reactionUpdate.php => update-com.woltlab.wcf_5.2_reactionUpdate.php} (100%)
 create mode 100644 wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2_reloadOptions.php

diff --git a/com.woltlab.wcf/files_reloadOptions.tar b/com.woltlab.wcf/files_reloadOptions.tar
new file mode 100644
index 0000000000000000000000000000000000000000..67eeeabc326d89c189f512ff57a2772e06039938
GIT binary patch
literal 2560
zcmeH_K?}kl7=}IjD|W0yOLI<WL5Jwv9~i`!Gd5ULrel9Uw?RaQ4nZTx?;@Y5@8|ox
zAk7+mxd=&!5CV~@Ue{q4QO0S)C>3-#m-2LjBL3yM#^*chp!Je-X#JoDc>bL!z^Rqg
zx474}tKky&@_Od+=G>}ULvb>$(v6KxX+HS^q2w)p${zd)PdtAr2=n}BVe;qvcY6;N
zH*izdfK-tOpZiQ?xU*B^qXD@d1CUQSI2M)DZHDo4yWO_RDt7=`s>L$HpX4Om2@V7Y
Lf&;;U`5d?dQ;198

literal 0
HcmV?d00001

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 9b5a151c6f..35707f5bc0 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -51,6 +51,11 @@
 	</instructions>
 	
 	<instructions type="update" fromversion="5.2.0 Alpha 1">
+		<!-- Import the new options first -->
+		<instruction type="option" />
+		<instruction type="file">files_reloadOptions.tar</instruction>
+		<instruction type="script" run="standalone">acp/update-com.woltlab.wcf_5.2_reloadOptions.php</instruction>
+		
 		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 		<instruction type="file">files_update.tar</instruction>
 		<instruction type="template">templates_update.tar</instruction>
@@ -61,7 +66,6 @@
 		
 		<instruction type="box" />
 		<instruction type="objectType" />
-		<instruction type="option" />
 		<instruction type="page" />
 	</instructions>
 </package>
diff --git a/wcfsetup/install/files/acp/update-com.woltlab.wcf_3.2_reactionUpdate.php b/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2_reactionUpdate.php
similarity index 100%
rename from wcfsetup/install/files/acp/update-com.woltlab.wcf_3.2_reactionUpdate.php
rename to wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2_reactionUpdate.php
diff --git a/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2_reloadOptions.php b/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2_reloadOptions.php
new file mode 100644
index 0000000000..ea2e7f4610
--- /dev/null
+++ b/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2_reloadOptions.php
@@ -0,0 +1,5 @@
+<?php
+namespace wcf\acp;
+use wcf\data\option\OptionEditor;
+
+OptionEditor::resetCache();
-- 
2.20.1