From 286bd957fefd5cbdb43d5b63f1c73b8499859a9c Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Thu, 12 Oct 2023 13:30:29 +0200 Subject: [PATCH] Enable the upgrade to the gold release of 6.0 --- .../install/files/lib/acp/page/PackageListPage.class.php | 8 +------- wcfsetup/install/lang/de.xml | 4 +--- wcfsetup/install/lang/en.xml | 4 +--- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php index 60c015d38d..c4625e830a 100644 --- a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php @@ -88,16 +88,10 @@ 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' => $availableUpgradeVersion, + 'availableUpgradeVersion' => WCF::AVAILABLE_UPGRADE_VERSION, 'upgradeOverrideEnabled' => PackageUpdateServer::isUpgradeOverrideEnabled(), ]); } diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index b776ba326c..9bb99d8a42 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -2005,13 +2005,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.]]> - + 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 ebeb996acf..9d46b6d396 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -1990,13 +1990,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.]]> - + 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