From 6fe6ff159a6adb123d6c64150b12f2724c25b3aa Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Mon, 11 Sep 2023 14:08:35 +0200 Subject: [PATCH] Add support for the test upgrade from 5.5 to 6.0 --- 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 9111a47d8b..5a90af40ea 100644 --- 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} -

{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 c4625e830a..60c015d38d 100644 --- 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 c666f51f08..28e8bded79 100644 --- 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 39f6b82029..b776ba326c 100644 --- 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}]]> {$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.]]> - + - 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 72ad062548..ebeb996acf 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -1990,10 +1990,12 @@ 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.]]> - + - 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