From b3dc7f9187e20b7acf89c9cd6e8c0cd46e87325d Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 5 Jul 2024 11:43:39 +0200 Subject: [PATCH] set version to 2.2.0-rc1 for upcoming release-candidate Signed-off-by: Michael Kaufmann --- install/froxlor.sql.php | 2 +- install/updates/froxlor/update_2.2.inc.php | 5 +++++ lib/Froxlor/Froxlor.php | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php index 84e40bb558..299560de0f 100644 --- a/install/froxlor.sql.php +++ b/install/froxlor.sql.php @@ -730,7 +730,7 @@ ('panel', 'logo_overridecustom', '0'), ('panel', 'settings_mode', '0'), ('panel', 'menu_collapsed', '1'), - ('panel', 'version', '2.2.0-dev1'), + ('panel', 'version', '2.2.0-rc1'), ('panel', 'db_version', '202401090'); diff --git a/install/updates/froxlor/update_2.2.inc.php b/install/updates/froxlor/update_2.2.inc.php index b8dbb6591d..9e96a98a1d 100644 --- a/install/updates/froxlor/update_2.2.inc.php +++ b/install/updates/froxlor/update_2.2.inc.php @@ -117,3 +117,8 @@ Froxlor::updateToDbVersion('202401090'); } + +if (Froxlor::isFroxlorVersion('2.2.0-dev1')) { + Update::showUpdateStep("Updating from 2.2.0-dev1 to 2.2.0-rc1", false); + Froxlor::updateToVersion('2.2.0-rc1'); +} diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php index 87ccc013e9..83bc550119 100644 --- a/lib/Froxlor/Froxlor.php +++ b/lib/Froxlor/Froxlor.php @@ -31,7 +31,7 @@ final class Froxlor { // Main version variable - const VERSION = '2.2.0-dev1'; + const VERSION = '2.2.0-rc1'; // Database version (YYYYMMDDC where C is a daily counter) const DBVERSION = '202401090';