From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Fri, 17 Sep 2010 12:36:31 +0000 (+0200)
Subject: Merge branch 'platal-1.0.0'
X-Git-Tag: xorg/1.0.1~189
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=f74509fbb4f06820dc3d028e3ffd2145f151b013;p=platal.git

Merge branch 'platal-1.0.0'

Conflicts:
	core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

f74509fbb4f06820dc3d028e3ffd2145f151b013
diff --cc core
index adf0fa2,1b54ef2..3c7bc7a
--- a/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit adf0fa2119688cf61ca23b7bc23b0730af702c6d
 -Subproject commit 1b54ef260c1db3f94830fb6f9b1b13aeb9fcdb78
++Subproject commit 3c7bc7a377e3d5422f61b92ddf69c4a953ad3d15
diff --cc modules/axletter/axletter.inc.php
index f31f979,5297ac9..53c7dd3
--- a/modules/axletter/axletter.inc.php
+++ b/modules/axletter/axletter.inc.php
@@@ -175,13 -175,12 +175,13 @@@ class AXLetter extends MassMaile
          if (!$this->_promo_min && !$this->_promo_max && !$this->_subset) {
              return '1';
          }
 +        /* TODO: refines this filter on promotions by using userfilter. */
          $where = array();
          if ($this->_promo_min) {
-             $where[] = "((ni.uid = 0 AND ni.promo >= {$this->_promo_min}) OR (ni.uid != 0 AND u.promo >= {$this->_promo_min}))";
+             $where[] = "((ni.uid = 0 AND ni.promo >= {$this->_promo_min}) OR (ni.uid != 0 AND pd.promo >= 'X{$this->_promo_min}'))";
          }
          if ($this->_promo_max) {
-             $where[] = "((ni.uid = 0 AND ni.promo <= {$this->_promo_max}) OR (ni.uid != 0 AND u.promo <= {$this->_promo_max}))";
+             $where[] = "((ni.uid = 0 AND ni.promo <= {$this->_promo_max}) OR (ni.uid != 0 AND pd.promo <= 'X{$this->_promo_max}'))";
          }
          if ($this->_subset) {
              require_once("emails.inc.php");