diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2008-12-09 21:47:06 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2008-12-09 21:47:06 -0500 |
| commit | 4b93bc99244fd7b7d56534d6877ec36e72409683 (patch) | |
| tree | e5cc3b9b7d18ea4f2ef94aa2260033c5933c2baa /lib/mail.php | |
| parent | 3210cd69cc295e2af9dce5daac4953822e4f9fc7 (diff) | |
on broadcast jabber and sms to people with the flags set
darcs-hash:20081210024706-5ed1f-fd54b76630656f7d4f7617309d2e4f87f25b006b.gz
Diffstat (limited to 'lib/mail.php')
| -rw-r--r-- | lib/mail.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/mail.php b/lib/mail.php index 313040ca2..a7cbab858 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -167,7 +167,8 @@ function mail_broadcast_notice_sms($notice) { 'ON user.id = subscription.subscriber ' . 'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' . 'AND user.smsemail IS NOT NULL ' . - 'AND user.smsnotify = 1'); + 'AND user.smsnotify = 1 ' . + 'AND subscription.sms = 1 '); while ($user->fetch()) { common_log(LOG_INFO, @@ -226,7 +227,6 @@ function mail_confirm_sms($code, $nickname, $address) { mail_send($recipients, $headers, $body); } - function mail_notify_nudge($from, $to) { common_init_locale($to->language); $subject = sprintf(_('You\'ve been nudged by %s'), $from->nickname); @@ -247,8 +247,6 @@ function mail_notify_nudge($from, $to) { return mail_to_user($to, $subject, $body); } - - function mail_notify_message($message, $from=NULL, $to=NULL) { if (is_null($from)) { |