summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <git@evanprodromou.name>2009-01-28 23:03:03 -0500
committerEvan Prodromou <git@evanprodromou.name>2009-01-28 23:03:03 -0500
commit04b3add162674df2ebdb4e4e347b7dbea934580b (patch)
tree40f9bf32a77ffff6ab52c4f5eb5f1c7b99ded7d7 /lib
parentfae7c08f2db136f14d8e2d51e834c680a610cd3d (diff)
only send group notices through Jabber to users with notices enabled
Diffstat (limited to 'lib')
-rw-r--r--lib/jabber.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/jabber.php b/lib/jabber.php
index 84d2a562c..6196bc9e1 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -403,7 +403,9 @@ function jabber_broadcast_notice($notice)
'FROM user JOIN notice_inbox ' .
'ON user.id = notice_inbox.user_id ' .
'WHERE notice_inbox.notice_id = ' . $notice->id . ' ' .
- 'AND notice_inbox.source = 2 ');
+ 'AND notice_inbox.source = 2 ' .
+ 'AND user.jabber is not null ' .
+ 'AND user.jabbernotify = 1 ');
while ($user->fetch()) {
if (!array_key_exists($user->id, $sent_to)) {