Release 6.0.1 dev 1

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 0694d56fdb8182fdc01405ef016aee7a7004e537..9489e73eea2139881f2cc503d96b2dc88c06d7dd 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>6.0.0</version>
-               <date>2023-10-11</date>
+               <version>6.0.1 dev 1</version>
+               <date>2023-10-19</date>
        </packageinformation>
 
        <authorinformation>
@@ -133,14 +133,12 @@ tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
                <instruction type="templateDelete" />
        </instructions>
 
-       <!--
-               Rerun the update script for trophies to fix any broken fallback values:
-               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.0_trophies.php</instruction>
-       -->
-
-       <instructions type="update" fromversion="6.0.0 RC 2">
+       <instructions type="update" fromversion="6.0.0">
+               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
                <instruction type="template">templates_update.tar</instruction>
+               <instruction type="script">acp/update_com.woltlab.wcf_6.0.1.php</instruction>
+               <instruction type="script">acp/update_com.woltlab.wcf_6.0_trophies.php</instruction>
                <instruction type="language"/>
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 82a5296a889014920ed58bb760f340fe97d4abdf..5b02e2d64b79889fce599d232f067d6061b89b3c 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -81,7 +81,7 @@ if (\function_exists('mb_regex_encoding')) {
 \mb_language('uni');
 
 // define current woltlab suite version
-\define('WCF_VERSION', '6.0.0');
+\define('WCF_VERSION', '6.0.1 dev 1');
 
 // define current unix timestamp
 \define('TIME_NOW', \time());