From: Vincent Zanotti <vincent.zanotti@polytechnique.org>
Date: Sun, 28 Sep 2008 11:14:11 +0000 (+0200)
Subject: Merge commit 'origin/master' into hruid
X-Git-Tag: xorg/0.10.0~86^2~13
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=0c8cd507ad27b70c20e9f056b77fc286ee88e04f;p=platal.git

Merge commit 'origin/master' into hruid
---

0c8cd507ad27b70c20e9f056b77fc286ee88e04f
diff --cc modules/marketing.php
index 9e62667,eb0778d..f6ac4fb
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@@ -157,9 -154,9 +157,9 @@@ class MarketingModule extends PLModul
          $res = XDB::iterator(
                  "SELECT  r.*, a.alias
                     FROM  register_marketing AS r
-              INNER JOIN  aliases            AS a ON (r.sender=a.id AND a.type = 'a_vie')
+               LEFT JOIN  aliases            AS a ON (r.sender=a.id AND a.type = 'a_vie')
                    WHERE  uid={?}
 -               ORDER BY  date", $uid);
 +               ORDER BY  date", $user->id());
          $page->assign('addr', $res);
  
          $res = XDB::query("SELECT date, relance FROM register_pending