summaryrefslogtreecommitdiff
path: root/lib/mail.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-08 11:55:32 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-08 11:55:32 -0700
commitadfb79a9bbdfb43f35c0f022c1de6118b10ce115 (patch)
treee14ec0cc5161cfd5cc321eaaa5b8eed07df952de /lib/mail.php
parent1a126032efbcb265a59f4d682bd072251f857c97 (diff)
parent265e2bd58de2a01e0d7840310eb44b21b70e3914 (diff)
Merge branch '0.7.x' into 0.8.x
Conflicts: classes/Notice.php classes/Profile.php lib/common.php lib/util.php scripts/getvaliddaemons.php scripts/stopdaemons.sh
Diffstat (limited to 'lib/mail.php')
-rw-r--r--lib/mail.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/mail.php b/lib/mail.php
index 27a1d99dc..4e1f1dbb1 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -335,6 +335,7 @@ function mail_broadcast_notice_sms($notice)
"FROM $UT JOIN subscription " .
"ON $UT.id = subscription.subscriber " .
'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' .
+ 'AND subscription.subscribed != subscription.subscriber ' .
"AND $UT.smsemail IS NOT null " .
"AND $UT.smsnotify = 1 " .
'AND subscription.sms = 1 ');