Release 5.4.0 RC 2

diff --git a/com.woltlab.wcf/files_pre_check.tar b/com.woltlab.wcf/files_pre_check.tar
index af4ee6047ced7eb20580649bd4edddeec98b5d1d..d2cc313a698675afda633b966370c7f21684cc44 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 bccac1a659c0f51aedad08633b83eeec30f38b91..936bf97f00eeb63cede0dc10de75d6d4ed59ad3d 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
                <packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
                <packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
                <isapplication>1</isapplication>
-               <version>5.4.0 RC 1</version>
-               <date>2021-06-30</date>
+               <version>5.4.0 RC 2</version>
+               <date>2021-07-08</date>
        </packageinformation>
        
        <authorinformation>
@@ -149,10 +149,15 @@ tar cvf com.woltlab.wcf/files_pre.tar -C wcfsetup/install/files/ \
                <instruction type="script">acp/update_com.woltlab.wcf_5.4_deleteLanguageItems.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="5.4.0 Beta 2">
+       <instructions type="update" fromversion="5.4.0 RC 1">
                <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
                
                <instruction type="language" />
+
+               <!-- The check would make more sense earlier in the process, but since this is intended
+                    to catch some earlier upgrades with broken ImageMagick setups, this should be fine. -->
+               <instruction type="script">acp/update_com.woltlab.wcf_5.4_checkSystemRequirements.php</instruction>
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index a68faffb16b977b312f6af2c5c737c0ac80432c9..d7cc566633335f2d3e7959783ef050f2a5ee1d2e 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -53,7 +53,7 @@ if (!@\ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-\define('WCF_VERSION', '5.4.0 RC 1');
+\define('WCF_VERSION', '5.4.0 RC 2');
 
 // define current API version
 // @deprecated 5.2