From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Fri, 20 Nov 2020 10:19:32 +0000 (+0100)
Subject: Merge branch '5.2' into 5.3
X-Git-Tag: 5.3.1~15
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7c624730384b3a08d20d4e549eb75448ee168451;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.2' into 5.3
---

7c624730384b3a08d20d4e549eb75448ee168451
diff --cc com.woltlab.wcf/package.xml
index 2c033b692b,ee842d0e94..246a333928
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@@ -50,62 -50,79 +50,63 @@@
  		<instruction type="script">acp/post_install.php</instruction>
  	</instructions>
  	
 -	<instructions type="update" fromversion="3.1.*">
 -		<instruction type="file">files_preUpdate.tar</instruction>
 -		<instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_5.2_preUpdate.php</instruction>
 -		
 -		<!-- Contains a few PIP-scripts, \wcf\data\option\OptionEditor and \wcf\system\database\table\* -->
 +	<instructions type="update" fromversion="5.2.*">
 +		<!-- We need to deploy `lib/core.functions.php` and `lib/system/api/*` first, otherwise
 +		     Guzzle can not be found during the development of the regular file PIP. -->
  		<instruction type="file" run="standalone">files_pre.tar</instruction>
  		
 -		<!-- Required language categories for the reactions. -->
 -		<instruction type="language" run="standalone" />
 -		
 -		<instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_5.2_prePhpApi.php</instruction>
 -		
 -		<instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_5.2.php</instruction>
 +		<!-- Verify that there are no duplicate usernames and warn about them if any are found. -->
 +		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3_preUpdate.php</instruction>
  		
 -		<!-- Convert likes to reactions. -->
 -		<instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_5.2_reactionUpdate.php</instruction>
 +		<!-- Deploy the database changes as early as possible to avoid any conflicts by calls to
 +		     tables that do not exist in 5.2, in particular `wcfN_devtools_missing_language_item`.-->
 +		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3.php</instruction>
  		
 -		<!-- Delete all likeable recent activity events, because they don't have the reactionType stored. -->
 -		<instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_5.2_deleteRecentActivity.php</instruction>
 +		<instruction type="file" />
 +		<instruction type="acpTemplate" />
 +		<instruction type="template" />
  		
 -		<instruction type="file" run="standalone">files_routingCacheBuilder.tar</instruction>
 +		<instruction type="option" run="standalone" />
  		
 -		<instruction type="sql">update_5.2.sql</instruction>
 -		
 -		<instruction type="option" />
 -		<instruction type="script">acp/update_com.woltlab.wcf_5.2_reloadOptions.php</instruction>
 +		<instruction type="acpMenu" />
 +		<instruction type="clipboardAction" />
 +		<instruction type="mediaProvider" />
 +		<instruction type="userGroupOption" />
 +		<instruction type="userMenu" />
 +		<instruction type="page" />
  		
 -		<instruction type="coreObject" />
 +		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3_emailConfirmation.php</instruction>
  		
 -		<instruction type="file" run="standalone" />
 -		<instruction type="template" run="standalone" />
 -		<instruction type="acpTemplate" run="standalone" />
 +		<!-- The internal data structure of sitemaps have been modified, this script must be run before
 +		     the `objectType` pip to prevent any data corruption. -->
 +		<instruction type="script">acp/update_com.woltlab.wcf_5.3_sitemaps.php</instruction>
  		
 -		<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="userOption" />
  		
 -		<instruction type="style" run="standalone">defaultStyle.tar</instruction>
 +		<instruction type="language" />
  		
 -		<instruction type="script">acp/update_com.woltlab.wcf_preventMailAbuse.php</instruction>
 -	</instructions>
 -	
 -	<!-- Include `update_com.woltlab.wcf_5.2.10_orphanedComments.php` in the next update! -->
 -	
 -	<instructions type="update" fromversion="5.2.8">
 -		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 -		<instruction type="file">files_update.tar</instruction>
 -		<instruction type="template">templates_update.tar</instruction>
 +		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3_invalidateMailForm.php</instruction>
  		
 -		<instruction type="language" />
 +		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3_fixActivationMethod.php</instruction>
  		
 -		<!-- https://github.com/WoltLab/WCF/issues/3474 -->
 -		<instruction type="page" />
 +		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.3_style.php</instruction>
  		
 -		<instruction type="mediaProvider" />
 +		<instruction type="style" run="standalone">defaultStyle.tar</instruction>
  		
 -		<!-- https://github.com/WoltLab/WCF/issues/3429 -->
 -		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_embeddedObjectOrphans.php</instruction>
 +		<!-- This SQL step purges the legacy package servers, this must come last to make sure that an early
 +		     abort of the core upgrade does not brick the installation. -->
 +		<instruction type="sql">update_5.3.sql</instruction>
  	</instructions>
 +	
 +	<!-- Run the option.xml update for 5.3.0 -> 5.3.1, due to the missing removal of external_link_rel_nofollow. -->
 +	<!-- Run update_com.woltlab.wcf_5.3.1_style.php for 5.3.0 -> 5.3.1 -->
++	<!-- Include `update_com.woltlab.wcf_5.2.10_orphanedComments.php` in the next update! -->
 +	<!-- Add a note about the updated CSS in email_html.tpl to the release notes:
 +		https://github.com/WoltLab/WCF/commit/1ac55ad408d5bfab4f69714c6259cc5d09ceb344
 +		Administrators are highly encouraged to apply the CSS adjustments to their custom template version.
 +	-->
  </package>