From 03b09125b69a18f9b22403284a5bde1fbb641147 Mon Sep 17 00:00:00 2001 From: Vincent Zanotti Date: Fri, 12 Dec 2008 14:26:40 +0100 Subject: [PATCH] Fixes the display of aliases on the admin/user/ page. Signed-off-by: Vincent Zanotti --- modules/admin.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/admin.php b/modules/admin.php index a8ce74b..152c65e 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -662,7 +662,11 @@ class AdminModule extends PLModule "SELECT alias FROM virtual INNER JOIN virtual_redirect USING (vid) - WHERE type = 'user' AND redirect LIKE CONCAT({?}, '@%')", $user->id())); + WHERE type = 'user' AND (redirect = {?} OR redirect = {?})", + $user->forlifeEmail(), + // TODO: remove this über-ugly hack. The issue is that you need + // to remove all @m4x.org addresses in virtual_redirect first. + $user->login() . '@' . $globals->mail->domain2)); $page->assign('aliases', XDB::iterator( "SELECT alias, type='a_vie' AS for_life,FIND_IN_SET('bestalias',flags) AS best,expire -- 2.1.4