From eed3b4e90505f7aef7ca8ee436c187e973855729 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 14 Jul 2021 17:38:49 +0200
Subject: [PATCH] Release 5.4.0

---
 com.woltlab.wcf/package.xml                     | 15 +++++----------
 wcfsetup/install/files/lib/system/WCF.class.php |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index ad05786268..c89ce9d0a1 100644
--- 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 2</version>
-		<date>2021-07-08</date>
+		<version>5.4.0</version>
+		<date>2021-07-15</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -152,18 +152,13 @@ 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 RC 1">
+	<instructions type="update" fromversion="5.4.0 RC 2">
 		<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" run="standalone">acp/update_com.woltlab.wcf_5.4_checkSystemRequirements.php</instruction>
-
-		<!-- This was missed in the upgrade instructions from 5.3. -->
-		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_5.4_styleCoverPhoto.php</instruction>
+		
+		<instruction type="option" />
 	</instructions>
 </package>
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index d7cc566633..3edfbd5158 100644
--- 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 2');
+\define('WCF_VERSION', '5.4.0');
 
 // define current API version
 // @deprecated 5.2
-- 
2.20.1