From: Stéphane Jacob <sj@m4x.org>
Date: Thu, 3 Nov 2011 09:52:24 +0000 (+0100)
Subject: Allows research on NL subscription using UFC_NLSubscribed.
X-Git-Tag: xorg/1.1.4~33
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=821198c7f5394839f6421c54a32ae2a0dca19b3d;p=platal.git

Allows research on NL subscription using UFC_NLSubscribed.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/classes/userfilter/conditions.inc.php b/classes/userfilter/conditions.inc.php
index bb9ad83..a3faa35 100644
--- a/classes/userfilter/conditions.inc.php
+++ b/classes/userfilter/conditions.inc.php
@@ -838,7 +838,7 @@ class UFC_NLSubscribed extends UserFilterCondition
 {
     private $nlid;
     private $issue_id;
-    public function __construct($nlid, $issue_id)
+    public function __construct($nlid, $issue_id = null)
     {
         $this->nlid = $nlid;
         $this->issue_id = $issue_id;
@@ -847,7 +847,11 @@ class UFC_NLSubscribed extends UserFilterCondition
     public function buildCondition(PlFilter $uf)
     {
         $sub = $uf->addNewsLetterFilter($this->nlid);
-        return XDB::format($sub . '.nlid IS NOT NULL AND ( ' . $sub . '.last IS NULL OR ' . $sub . '.last < {?})', $this->issue_id);
+        $cond = $sub . '.nlid IS NOT NULL';
+        if (!is_null($this->issue_id)) {
+            $cond = XDB::format($cond . ' AND ( ' . $sub . '.last IS NULL OR ' . $sub . '.last < {?})', $this->issue_id);
+        }
+        return $cond;
     }
 }
 // }}}