X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fmail.php;h=a7cbab8589665daa7343ce171d892e66d5947037;hb=2abe10b8ea4b5d69fc7f6513bf465541454ca2cf;hp=313040ca252987792c2a4fe9be06df30426058db;hpb=792cb7a5358c4b7f80b124d5a80c625a7d4d89ea;p=quix0rs-gnu-social.git diff --git a/lib/mail.php b/lib/mail.php index 313040ca25..a7cbab8589 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)) {