From c1134ef2ba30baf791564d659bb8f27f4987739c Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Wed, 5 Aug 2009 14:44:23 +0200 Subject: [PATCH] Fixes axletter. --- modules/axletter.php | 4 ++-- modules/axletter/axletter.inc.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/axletter.php b/modules/axletter.php index b1f3a86..b27dc7d 100644 --- a/modules/axletter.php +++ b/modules/axletter.php @@ -102,7 +102,7 @@ class AXLetterModule extends PLModule $res = XDB::query("SELECT * FROM axletter WHERE FIND_IN_SET('new', bits)"); if ($res->numRows()) { extract($res->fetchOneAssoc(), EXTR_OVERWRITE); - $subset_to = explode("\n", $subset); + $subset_to = ($subset ? explode("\n", $subset) : null); $subset = (count($subset_to) > 0); $saved = true; } else { @@ -163,7 +163,7 @@ class AXLetterModule extends PLModule XDB::execute("REPLACE INTO axletter SET id = {?}, short_name = {?}, subject = {?}, title = {?}, body = {?}, signature = {?}, promo_min = {?}, promo_max = {?}, echeance = {?}, subset = {?}", - $id, $short_name, $subject, $title, $body, $signature, $promo_min, $promo_max, $echeance, $subset ? implode("\n", $subset_to): null); + $id, $short_name, $subject, $title, $body, $signature, $promo_min, $promo_max, $echeance, $subset ? implode("\n", $subset_to) : null); if (!$saved) { global $globals; $mailer = new PlMailer(); diff --git a/modules/axletter/axletter.inc.php b/modules/axletter/axletter.inc.php index e238c41..d85d25f 100644 --- a/modules/axletter/axletter.inc.php +++ b/modules/axletter/axletter.inc.php @@ -60,7 +60,7 @@ class AXLetter extends MassMailer if ($this->_date == '0000-00-00') { $this->_date = 0; } - $this->_subset_to = explode("\n", $this->_subset_to); + $this->_subset_to = ($this->_subset_to ? explode("\n", $this->_subset_to) : null); $this->_subset = (count($this->_subset_to) > 0); } @@ -205,7 +205,7 @@ class AXLetter extends MassMailer require_once("emails.inc.php"); $ids = ids_from_mails($this->_subset_to); $ids_list = implode(',', $ids); - if(count($ids_list) > 0) { + if(count($ids) > 0) { $where[] = "ni.user_id IN ($ids_list)"; } else { // No valid email -- 2.1.4