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

d00p · d00p · commit b6fae81f1b1e · 2025-05-02T09:28:33.000+02:00
diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php
@@ -733,7 +733,7 @@
 	('panel', 'logo_overridecustom', '0'),
 	('panel', 'settings_mode', '0'),
 	('panel', 'menu_collapsed', '1'),
-	('panel', 'version', '2.2.6'),
+	('panel', 'version', '2.2.7'),
 	('panel', 'db_version', '202412030');
 
 
diff --git a/install/updates/froxlor/update_2.2.inc.php b/install/updates/froxlor/update_2.2.inc.php
@@ -250,3 +250,8 @@
 	Update::showUpdateStep("Updating from 2.2.5 to 2.2.6", false);
 	Froxlor::updateToVersion('2.2.6');
 }
+
+if (Froxlor::isFroxlorVersion('2.2.6')) {
+	Update::showUpdateStep("Updating from 2.2.6 to 2.2.7", false);
+	Froxlor::updateToVersion('2.2.7');
+}
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.6';
+	const VERSION = '2.2.7';
 
 	// Database version (YYYYMMDDC where C is a daily counter)
 	const DBVERSION = '202412030';

Original file line number	Diff line number	Diff line change
`@@ -250,3 +250,8 @@`
`250`	`250`	`Update::showUpdateStep("Updating from 2.2.5 to 2.2.6", false);`
`251`	`251`	`Froxlor::updateToVersion('2.2.6');`
`252`	`252`	`}`
	`253`	`+`
	`254`	`+if (Froxlor::isFroxlorVersion('2.2.6')) {`
	`255`	`+ Update::showUpdateStep("Updating from 2.2.6 to 2.2.7", false);`
	`256`	`+ Froxlor::updateToVersion('2.2.7');`
	`257`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ final class Froxlor`
`31`	`31`	`{`
`32`	`32`
`33`	`33`	`// Main version variable`
`34`		`- const VERSION = '2.2.6';`
	`34`	`+ const VERSION = '2.2.7';`
`35`	`35`
`36`	`36`	`// Database version (YYYYMMDDC where C is a daily counter)`
`37`	`37`	`const DBVERSION = '202412030';`