From: mutec <mysterycode@mysterycode.de>
Date: Wed, 31 Jul 2019 21:30:02 +0000 (+0200)
Subject: prepare update instructions 3.1.10 pl 2 > 5.2.0
X-Git-Tag: 5.2.0_RC_1~19^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=90b4ec65d2c87ecb70ff4f0c2d95da37b6318bbe;p=GitHub%2FWoltLab%2FWCF.git

prepare update instructions 3.1.10 pl 2 > 5.2.0
---

diff --git a/com.woltlab.wcf/files_pre.tar b/com.woltlab.wcf/files_pre.tar
new file mode 100644
index 0000000000..db0b9033e5
Binary files /dev/null and b/com.woltlab.wcf/files_pre.tar differ
diff --git a/com.woltlab.wcf/files_pre_sql.tar b/com.woltlab.wcf/files_pre_sql.tar
deleted file mode 100644
index cc0f344add..0000000000
Binary files a/com.woltlab.wcf/files_pre_sql.tar and /dev/null differ
diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index ed77b29a05..0d5f9be021 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -62,4 +62,55 @@
 		
 		<instruction type="objectType" />
 	</instructions>
+	
+	<instructions type="update" fromversion="3.1.10 pl 2">
+		<instruction type="sql">update_5.2_pre_sql_api.sql</instruction>
+		
+		<!-- contains 3 PIP-scripts, \wcf\data\option\OptionEditor, \wcf\system\cache\builder\RoutingCacheBuilder, \wcf\system\database\table\ -->
+		<instruction type="file" run="standalone">files_pre.tar</instruction>
+		
+		<!-- we need some new categories for execution of reactionUpdate already -->
+		<instruction type="language" run="standalone" />
+		
+		<!-- update database structure using new api -->
+		<instruction type="script">acp/update-com.woltlab.wcf_5.2.php</instruction>
+		
+		<!-- convert likes to reactions -->
+		<instruction type="script">acp/update-com.woltlab.wcf_5.2_reactionUpdate.php</instruction>
+		
+		<!-- reload routing cache to avoid an exception because the new applicationOverride information is missing in cache -->
+		<instruction type="script" run="standalone">acp/update-com.woltlab.wcf_5.2_reloadRoutingCache.php</instruction>
+		
+		<instruction type="option" />
+		<!-- reload options using the new OptionEditor for providing the enterprise-mode option for further requests (required after file-PIP!) -->
+		<instruction type="script">acp/update-com.woltlab.wcf_5.2_reloadOptions.php</instruction>
+		
+		<instruction type="coreObject" />
+		
+		<instruction type="file" run="standalone" />
+		<instruction type="template" run="standalone" />
+		<instruction type="acpTemplate" run="standalone" />
+		
+		<instruction type="acpMenu" />
+		<instruction type="userGroupOption" />
+		<instruction type="cronjob" />
+		<instruction type="clipboardAction" />
+		<instruction type="objectTypeDefinition" />
+		<instruction type="objectType" />
+		<instruction type="acpSearchProvider" />
+		
+		<instruction type="userOption" run="standalone" />
+		
+		<instruction type="bbcode" />
+		<instruction type="userMenu" />
+		<instruction type="userNotificationEvent" />
+		<instruction type="page" />
+		<instruction type="menu" />
+		<instruction type="menuItem" />
+		<instruction type="box" />
+		<instruction type="mediaProvider" />
+		<instruction type="templateListener" />
+		
+		<instruction type="style" run="standalone">defaultStyle.tar</instruction>
+	</instructions>
 </package>
diff --git a/com.woltlab.wcf/update_5.2_pre_sql_api.sql b/com.woltlab.wcf/update_5.2_pre_sql_api.sql
index 5a01b36c35..3336bfe03c 100644
--- a/com.woltlab.wcf/update_5.2_pre_sql_api.sql
+++ b/com.woltlab.wcf/update_5.2_pre_sql_api.sql
@@ -1,2 +1,6 @@
 -- The database API requires this column in order to work properly. DO NOT MOVE THIS! 
 ALTER TABLE wcf1_package_installation_sql_log ADD COLUMN isDone TINYINT(1) NOT NULL DEFAULT 1;
+
+-- Let's do this here too, so we won't need another step for inserting two values
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfEditorTableBorder', 'rgba(221, 221, 221, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfPageThemeColor', ''); -- uses `$wcfHeaderBackground` if left empty
diff --git a/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2_reloadRoutingCache.php b/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2_reloadRoutingCache.php
new file mode 100644
index 0000000000..c71bd65294
--- /dev/null
+++ b/wcfsetup/install/files/acp/update-com.woltlab.wcf_5.2_reloadRoutingCache.php
@@ -0,0 +1,5 @@
+<?php
+namespace wcf\acp;
+use wcf\system\cache\builder\RoutingCacheBuilder;
+
+RoutingCacheBuilder::getInstance()->reset();