Merge remote-tracking branch 'origin/main' into v2.2

froxlor · Aug 8, 2024 · d357bde · d357bde
2 parents 27db472 + 2927415
commit d357bde
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git 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-rc2'),
+	('panel', 'version', '2.2.0-rc3'),
 	('panel', 'db_version', '202407200');
 
 

diff --git a/install/updates/froxlor/update_2.2.inc.php b/install/updates/froxlor/update_2.2.inc.php
@@ -145,3 +145,8 @@
 	Update::showUpdateStep("Updating from 2.2.0-rc1 to 2.2.0-rc2", false);
 	Froxlor::updateToVersion('2.2.0-rc2');
 }
+
+if (Froxlor::isFroxlorVersion('2.2.0-rc2')) {
+	Update::showUpdateStep("Updating from 2.2.0-rc2 to 2.2.0-rc3", false);
+	Froxlor::updateToVersion('2.2.0-rc3');
+}
diff --git 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-rc2';
+	const VERSION = '2.2.0-rc3';
 
 	// Database version (YYYYMMDDC where C is a daily counter)
 	const DBVERSION = '202407200';