From 5688690eb8aa18edd57c088365052d602d0392cb Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Sun, 8 Jan 2023 11:00:59 +0100 Subject: [PATCH] set version to 2.0.0 for upcoming stable release Signed-off-by: Michael Kaufmann --- install/froxlor.sql.php | 2 +- install/updates/froxlor/update_2.x.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 44a978ed..ee7d041d 100644 --- a/install/froxlor.sql.php +++ b/install/froxlor.sql.php @@ -696,7 +696,7 @@ opcache.validate_timestamps'), ('system', 'distribution', ''), ('system', 'update_channel', 'stable'), ('system', 'updatecheck_data', ''), - ('system', 'update_notify_last', '2.0.0-beta1'), + ('system', 'update_notify_last', '2.0.0'), ('system', 'traffictool', 'goaccess'), ('api', 'enabled', '0'), ('2fa', 'enabled', '1'), diff --git a/install/updates/froxlor/update_2.x.inc.php b/install/updates/froxlor/update_2.x.inc.php index f0a6a12f..6c4b6ec1 100644 --- a/install/updates/froxlor/update_2.x.inc.php +++ b/install/updates/froxlor/update_2.x.inc.php @@ -216,3 +216,8 @@ EOF; Froxlor::updateToDbVersion('202212060'); } + +if (Froxlor::isFroxlorVersion('2.0.0-beta1')) { + Update::showUpdateStep("Updating from 2.0.0-beta1 to 2.0.0", false); + Froxlor::updateToVersion('2.0.0'); +} diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php index 5ab0d98e..fdd3965b 100644 --- a/lib/Froxlor/Froxlor.php +++ b/lib/Froxlor/Froxlor.php @@ -31,7 +31,7 @@ final class Froxlor { // Main version variable - const VERSION = '2.0.0-beta1'; + const VERSION = '2.0.0'; // Database version (YYYYMMDDC where C is a daily counter) const DBVERSION = '202212060';