From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Sun, 8 May 2011 16:22:28 +0000 (+0200)
Subject: UFC_Email looks in accounts.email as well.
X-Git-Tag: xorg/1.1.1~19
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=63bd7d2f424c1e60e93c6f11efd568b103a64217;p=platal.git

UFC_Email looks in accounts.email as well.

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---

diff --git a/classes/userfilter/conditions.inc.php b/classes/userfilter/conditions.inc.php
index 54932f9..896e12e 100644
--- a/classes/userfilter/conditions.inc.php
+++ b/classes/userfilter/conditions.inc.php
@@ -993,7 +993,7 @@ class UFC_Email extends UserFilterCondition
 
         if (count($foreign) > 0) {
             $sub = $uf->addEmailRedirectFilter($foreign);
-            $cond[] = XDB::format('ra' . $sub . '.redirect IS NOT NULL OR ra' . $sub . '.redirect IN {?}', $foreign);
+            $cond[] = XDB::format('ra' . $sub . '.redirect IS NOT NULL OR ra' . $sub . '.redirect IN {?} OR a.email IN {?}', $foreign, $foreign);
         }
         if (count($local) > 0) {
             $sub = $uf->addAliasFilter($local);