From 8b230d50493f9e6e0909d02205e9bd7167373fdd Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Thu, 15 Jul 2010 19:59:03 +0200 Subject: [PATCH] Fixes link for broken emails retrieval. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- modules/email.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/email.php b/modules/email.php index 49c1cb7..197ae8e 100644 --- a/modules/email.php +++ b/modules/email.php @@ -668,13 +668,14 @@ class EmailModule extends PLModule $page->assign('neuneu', true); } else { $page->assign('email',$email); - $x = XDB::fetchOneAssoc("SELECT e1.uid, e1.panne != 0 AS panne, - (count(e2.uid) + IF(FIND_IN_SET('googleapps', eo.storage), 1, 0)) AS nb_mails - FROM emails as e1 + $x = XDB::fetchOneAssoc("SELECT e1.uid, e1.panne != 0 AS panne, a.hruid, + (COUNT(e2.uid) + IF(FIND_IN_SET('googleapps', eo.storage), 1, 0)) AS nb_mails + FROM emails AS e1 INNER JOIN email_options AS eo ON (eo.uid = e1.uid) - LEFT JOIN emails as e2 ON(e1.uid = e2.uid - AND FIND_IN_SET('active', e2.flags) - AND e1.email != e2.email) + INNER JOIN accounts AS a ON (e1.uid = a.uid) + LEFT JOIN emails AS e2 ON (e1.uid = e2.uid + AND FIND_IN_SET('active', e2.flags) + AND e1.email != e2.email) WHERE e1.email = {?} GROUP BY e1.uid", $email); if ($x) { -- 2.1.4