Enable the upgrade to WoltLab Suite 5.5

Based on 41f100782ce6abe92f144810b719c15e53bf4849

diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index d39947e9fe8c708f5386ae8b88c69b1998fc194a..517f3dac78d2fb1cbd4c0071bdda8f3bf2d2f57d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -72,9 +72,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 15ddf40bd78ab731135eaa0666fbb50126b4e7d0..52c4016d0202c7c19a638d970d257c237ba2dcfb 100644 (file)
--- a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
@@ -106,11 +106,17 @@ 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(),
             'packageID' => $this->packageID,
             '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 fb0b7e3a4497c1518177a2c0c1d9b44f96f3889e..f52cd45239edca69de3e28ba19e893bdb44b88cb 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -83,7 +83,7 @@ class WCF
      * @var ?string
      * @since 5.3
      */
-    public const AVAILABLE_UPGRADE_VERSION = null;
+    public const AVAILABLE_UPGRADE_VERSION = '5.5';
 
     /**
      * list of supported legacy API versions

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index e48ee7b85f64c907c193bea8595a26103aab421d..00b0ed24bd3d2cb463be8a681ba20215d81d1ebc 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -2021,9 +2021,11 @@ 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.availableUpgradeVersion"><![CDATA[Neue Version verfügbar!<br><br>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-53-auf-54" 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-53-auf-54" 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 184b31ff071afa9c8d3b5cdfe261bd3b6af808fb..d1439a3e65c7b4f2aaf45c66c3cebc529f6728fa 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -2006,9 +2006,11 @@ 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.availableUpgradeVersion"><![CDATA[New Version Available!<br><br>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-52-to-53" 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-52-to-53" 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>