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

froxlor · Nov 2, 2024 · 4db5b09 · 4db5b09
2 parents 2c9f9eb + 4f11473
commit 4db5b09
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.4'),
+	('panel', 'version', '2.2.5'),
 	('panel', 'db_version', '202409280');
 
 

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