use correct field-name in email-domain-overview; set version to 2.2.3…

… for upcoming bugfix release Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
froxlor · Oct 9, 2024 · 11a5c38 · 11a5c38
1 parent 4f4abad
commit 11a5c38
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 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.2'),
+	('panel', 'version', '2.2.3'),
 	('panel', 'db_version', '202409280');
 
 

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

diff --git a/lib/tablelisting/customer/tablelisting.emails_overview.php b/lib/tablelisting/customer/tablelisting.emails_overview.php
@@ -56,7 +56,7 @@
 			],
 		],
 		'visible_columns' => Listing::getVisibleColumnsForListing('emaildomain_list', [
-			'd.domain',
+			'd.domain_ace',
 			'addresses',
 			'accounts',
 			'forwarder',