only send group notices through Jabber to users with notices enabled

diff --git a/lib/jabber.php b/lib/jabber.php
index 84d2a562cecccbb64791a158f1f88ec3ff66d4da..6196bc9e1d92a0a59315f4ac705a3f69bf4402c9 100644 (file)
--- 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)) {