From 777c59106869d8c7d6f55e3b07565e195bee6227 Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sun, 28 Feb 2010 17:24:02 +0100 Subject: [PATCH] Fetch homonymy information in default query. Signed-off-by: Florent Bruneau --- classes/user.php | 3 ++- modules/email.php | 7 +------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/classes/user.php b/classes/user.php index 77bacbf..532b39e 100644 --- a/classes/user.php +++ b/classes/user.php @@ -170,7 +170,7 @@ class User extends PlUser $uids = array_map(array('XDB', 'escape'), $uids); - return XDB::iterator('SELECT a.uid, a.hruid, a.registration_date, + return XDB::iterator('SELECT a.uid, a.hruid, a.registration_date, ah.alias AS homonym, CONCAT(af.alias, \'@' . $globals->mail->domain . '\') AS forlife, CONCAT(af.alias, \'@' . $globals->mail->domain2 . '\') AS forlife_alternate, CONCAT(ab.alias, \'@' . $globals->mail->domain . '\') AS bestalias, @@ -187,6 +187,7 @@ class User extends PlUser INNER JOIN account_types AS at ON (at.type = a.type) LEFT JOIN aliases AS af ON (af.uid = a.uid AND af.type = \'a_vie\') LEFT JOIN aliases AS ab ON (ab.uid = a.uid AND FIND_IN_SET(\'bestalias\', ab.flags)) + LEFT JOIN aliases AS ah ON (ah.uid = a.uid AND ah.type = \'homonyme\') LEFT JOIN emails AS e ON (e.uid = a.uid AND e.flags = \'active\') LEFT JOIN email_options AS eo ON (eo.uid = a.uid) ' . $joins . ' diff --git a/modules/email.php b/modules/email.php index db028d1..057de8d 100644 --- a/modules/email.php +++ b/modules/email.php @@ -84,12 +84,7 @@ class EmailModule extends PLModule $page->assign('aliases', XDB::iterator($sql, $user->id())); // Check for homonyms. - $homonyme = XDB::query( - "SELECT alias - FROM aliases - INNER JOIN homonyms ON (uid = homonyme_id) - WHERE user_id = {?} AND type = 'homonyme'", $user->id()); - $page->assign('homonyme', $homonyme->fetchOneCell()); + $page->assign('homonyme', $user->homonyme); // Display active redirections. $redirect = new Redirect($user); -- 2.1.4