From 15933d22a95b67d57ae794a88471098326911aba Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 3 Jun 2022 15:10:21 +0200 Subject: [PATCH] Enable the upgrade to WoltLab Suite 5.5 Based on 41f100782ce6abe92f144810b719c15e53bf4849 --- wcfsetup/install/files/acp/templates/packageList.tpl | 4 ++-- .../install/files/lib/acp/page/PackageListPage.class.php | 8 +++++++- wcfsetup/install/files/lib/system/WCF.class.php | 2 +- wcfsetup/install/lang/de.xml | 6 ++++-- wcfsetup/install/lang/en.xml | 6 ++++-- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl index d39947e9fe..517f3dac78 100644 --- 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} -

{lang version=$availableUpgradeVersion}wcf.acp.package.upgradeOverrideEnabled{/lang}

+

{lang version=$availableUpgradeVersion}wcf.acp.package.upgradeOverrideEnabled{/lang}

{else} -

{lang version=$availableUpgradeVersion}wcf.acp.package.availableUpgradeVersion{/lang}

+

{lang version=$availableUpgradeVersion}wcf.acp.package.availableUpgradeVersion{/lang}

{/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 15ddf40bd7..52c4016d02 100644 --- 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 fb0b7e3a44..f52cd45239 100644 --- 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 e48ee7b85f..00b0ed24bd 100644 --- 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}]]> {$taintedApplication->getPackage()->getTitle()}{/if} ist nicht vollständig installiert. Für eine weitere Verwendung der App ist eine Deinstallation mit anschließender Neuinstallation von Nöten.]]> - + -
Die neue WoltLab Suite {$version} steht zur Installation bereit. Eine Anleitung zur Durchführung des Upgrades steht im Handbuch zur Verfügung.
+ Handbuch zur Verfügung.
+
+ACHTUNG: Es handelt sich aktuell noch um eine Testversion die nicht für den produktiven Einsatz geeignet ist!

Systemvoraussetzungen prüfen, um das Upgrade freizugeben]]> diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 184b31ff07..d1439a3e65 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -2006,9 +2006,11 @@ If you have already bought the licenses for the listed apps, th {/implode}]]> {$taintedApplication->getPackage()->getTitle()}{/if} is not fully installed. You need to uninstall and then reinstall the app to be able to use it.]]> - + -
The new WoltLab Suite {$version} is available for installation. We have provided a guide with the instructions for the upgrade in our manual.
+ manual.
+
+WARNING: This is an unstable version intended for test purposes only, do not upgrade your production site at this time.

Validate the system requirements to begin the upgrade]]> -- 2.20.1