From c3b45f48b60b3730d1b62c5f49e9372417bda2ab Mon Sep 17 00:00:00 2001 From: Vincent Zanotti Date: Wed, 23 Apr 2008 22:25:24 +0200 Subject: [PATCH] Adds support for GoogleApps-only redirections in newsletters. Signed-off-by: Vincent Zanotti --- include/massmailer.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/massmailer.inc.php b/include/massmailer.inc.php index 07d9ee6..0279948 100644 --- a/include/massmailer.inc.php +++ b/include/massmailer.inc.php @@ -183,7 +183,8 @@ abstract class MassMailer INNER JOIN auth_user_quick AS q ON(q.user_id = u.user_id) INNER JOIN aliases AS a ON(u.user_id=a.id AND FIND_IN_SET('bestalias',a.flags)) LEFT JOIN emails AS e ON(e.uid=u.user_id AND e.flags='active') - WHERE ni.last < {?} AND ({$this->subscriptionWhere()}) AND e.email IS NOT NULL + WHERE ni.last < {?} AND ({$this->subscriptionWhere()}) AND + (e.email IS NOT NULL OR FIND_IN_SET('googleapps', u.mail_storage)) GROUP BY u.user_id"; } -- 2.1.4