Add support for the test upgrade from 5.5 to 6.0

diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 9111a47d8b459ba611578628eeff3e44a0c1f17e..5a90af40ea744285f6a02bd4870395a9c66efecc 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -64,9 +64,9 @@
 {if $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage')}
        {if $availableUpgradeVersion !== null}
                {if $upgradeOverrideEnabled}
-                       <p class="success">{lang version=$availableUpgradeVersion}wcf.acp.package.upgradeOverrideEnabled{/lang}</p>
+                       <p class="info">{lang version=$availableUpgradeVersion}wcf.acp.package.upgradeOverrideEnabled{/lang}</p>
                {else}
-                       <p class="success">{lang version=$availableUpgradeVersion}wcf.acp.package.availableUpgradeVersion{/lang}</p>
+                       <p class="info">{lang version=$availableUpgradeVersion}wcf.acp.package.availableUpgradeVersion{/lang}</p>
                {/if}
        {/if}
 {/if}

diff --git a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
index c4625e830a3e9c3744655b843aa9b9eb81aa9d76..60c015d38d2eccadd23010b6f4a14a28e87ae84c 100644 (file)
--- a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
@@ -88,10 +88,16 @@ class PackageListPage extends SortablePage
             $taintedApplications[$application->getPackage()->packageID] = $application;
         }
 
+        $availableUpgradeVersion = WCF::AVAILABLE_UPGRADE_VERSION;
+        // During the RC phase the upgrade should only be offered when the maintenance mode is enabled.
+        if (!\OFFLINE) {
+            $availableUpgradeVersion = null;
+        }
+
         WCF::getTPL()->assign([
             'recentlyDisabledCustomValues' => LanguageFactory::getInstance()->countRecentlyDisabledCustomValues(),
             'taintedApplications' => $taintedApplications,
-            'availableUpgradeVersion' => WCF::AVAILABLE_UPGRADE_VERSION,
+            'availableUpgradeVersion' => $availableUpgradeVersion,
             'upgradeOverrideEnabled' => PackageUpdateServer::isUpgradeOverrideEnabled(),
         ]);
     }

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index c666f51f08427fa05bdd2ec7a831a83d7977df55..28e8bded79ad72fe67c63713205a2b6ee6126b2e 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -80,7 +80,7 @@ class WCF
      * @var ?string
      * @since 5.3
      */
-    public const AVAILABLE_UPGRADE_VERSION = null;
+    public const AVAILABLE_UPGRADE_VERSION = '6.0';
 
     /**
      * list of supported legacy API versions

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 39f6b820293921c6d89d685b72f73f535347c5e5..b776ba326c8871c12a42c5f5a2559d3eb2d19061 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2005,10 +2005,12 @@ Die Datenbestände werden sorgfältig gepflegt, aber es ist nicht ausgeschlossen
 {/implode}]]></item>
                <item name="wcf.acp.package.application.isTainted"><![CDATA[Die App{if $taintedApplication|isset} <strong>{$taintedApplication->getPackage()->getTitle()}</strong>{/if} ist nicht vollständig installiert. Für eine weitere Verwendung der App ist eine Deinstallation mit anschließender Neuinstallation von Nöten.]]></item>
                <item name="wcf.acp.package.enableUpgradeOverride"><![CDATA[Aktualisierung auf WoltLab Suite {$version}]]></item>
-               <item name="wcf.acp.package.enableUpgradeOverride.enable"><![CDATA[Upgrade auf die neue Version freigeben]]></item>
+               <item name="wcf.acp.package.enableUpgradeOverride.enable"><![CDATA[Upgrade auf die Testversion freigeben]]></item>
                <item name="wcf.acp.package.enableUpgradeOverride.issues"><![CDATA[Die folgenden Probleme verhindern aktuell eine Aktualisierung:]]></item>
                <item name="wcf.acp.package.enableUpgradeOverride.success"><![CDATA[Die Überprüfung war erfolgreich, alle Systemvoraussetzungen für die Durchführung des Upgrades sind erfüllt.]]></item>
-               <item name="wcf.acp.package.availableUpgradeVersion"><![CDATA[Die neue WoltLab Suite {$version} steht zur Installation bereit. Eine Anleitung zur Durchführung des Upgrades steht im <a href="https://manual.woltlab.com/de/updates/#update-von-woltlab-suite-54-auf-55" class="externalURL">Handbuch</a> zur Verfügung.<br>
+               <item name="wcf.acp.package.availableUpgradeVersion"><![CDATA[Die neue WoltLab Suite {$version} steht zur Installation bereit. Eine Anleitung zur Durchführung des Upgrades steht im <a href="https://manual.woltlab.com/de/updates/#update-von-woltlab-suite-55-auf-60" class="externalURL">Handbuch</a> zur Verfügung.<br>
+<br>
+ACHTUNG: Es handelt sich aktuell noch um eine Testversion, die nicht für den produktiven Einsatz geeignet ist!<br>
 <br>
 <a href="{link controller='PackageEnableUpgradeOverride' application='wcf'}{/link}">Systemvoraussetzungen prüfen, um das Upgrade freizugeben</a>]]></item>
                <item name="wcf.acp.package.upgradeOverrideEnabled"><![CDATA[Die Installation der neuen WoltLab Suite {$version} wurde freigegeben. Zur Durchführung des Upgrades klicken Sie bitte auf den Button „Updates suchen“.<br>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 72ad0625486fe8c6940a50ebb11a75d0da423749..ebeb996acf39dfccefca6c89460bf9157847397b 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1990,10 +1990,12 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
 {/implode}]]></item>
                <item name="wcf.acp.package.application.isTainted"><![CDATA[The app{if $taintedApplication|isset} <strong>{$taintedApplication->getPackage()->getTitle()}</strong>{/if} is not fully installed. You need to uninstall and then reinstall the app to be able to use it.]]></item>
                <item name="wcf.acp.package.enableUpgradeOverride"><![CDATA[Upgrade to WoltLab Suite {$version}]]></item>
-               <item name="wcf.acp.package.enableUpgradeOverride.enable"><![CDATA[Enable Upgrading to the New Version]]></item>
+               <item name="wcf.acp.package.enableUpgradeOverride.enable"><![CDATA[Enable Upgrading to the Evaluation Version]]></item>
                <item name="wcf.acp.package.enableUpgradeOverride.issues"><![CDATA[The following issues currently prevent an upgrade:]]></item>
                <item name="wcf.acp.package.enableUpgradeOverride.success"><![CDATA[No issues detected, all system requirements for performing the upgrade are met.]]></item>
-               <item name="wcf.acp.package.availableUpgradeVersion"><![CDATA[The new WoltLab Suite {$version} is available for installation. We have provided a guide with the instructions for the upgrade in our <a href="https://manual.woltlab.com/en/updates/#upgrading-woltlab-suite-54-to-55" class="externalURL">manual</a>.<br>
+               <item name="wcf.acp.package.availableUpgradeVersion"><![CDATA[The new WoltLab Suite {$version} is available for installation. We have provided a guide with the instructions for the upgrade in our <a href="https://manual.woltlab.com/en/updates/#upgrading-woltlab-suite-55-to-60" class="externalURL">manual</a>.<br>
+<br>
+WARNING: This is an unstable version intended for test purposes only, do not upgrade your production site at this time.<br>
 <br>
 <a href="{link controller='PackageEnableUpgradeOverride' application='wcf'}{/link}">Validate the system requirements to begin the upgrade</a>]]></item>
                <item name="wcf.acp.package.upgradeOverrideEnabled"><![CDATA[The upgrade to WoltLab Suite {$version} is now ready. Please click on the button “Search for Updates” to start the upgrade.<br>