X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fjabber.php;h=ab0fd6af8663a6490e3df5dbc9c088e0894c1380;hb=2abe10b8ea4b5d69fc7f6513bf465541454ca2cf;hp=bd7d6b7074d38acbeb713a124d67178812eebfbc;hpb=0c71340c9fecfad17d2619dfa44cb669023f8179;p=quix0rs-gnu-social.git
diff --git a/lib/jabber.php b/lib/jabber.php
index bd7d6b7074..ab0fd6af86 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -123,7 +123,7 @@ function jabber_format_entry($profile, $notice) {
$html = "\n\n";
$html .= "\n";
- $html .= "".$profile->nickname.": ";
+ $html .= "".$profile->nickname.": ";
$html .= ($notice->rendered) ? $notice->rendered : common_render_content($notice->content, $notice);
$html .= "\n\n";
$html .= "\n\n";
@@ -207,7 +207,7 @@ function jabber_broadcast_notice($notice) {
$profile->free();
unset($profile);
-
+
$sent_to = array();
$conn = jabber_connect();
@@ -230,7 +230,7 @@ function jabber_broadcast_notice($notice) {
}
$user->free();
-
+
# Now, get users subscribed to this profile
$user = new User();
@@ -238,7 +238,8 @@ function jabber_broadcast_notice($notice) {
'FROM user JOIN subscription ON user.id = subscription.subscriber ' .
'WHERE subscription.subscribed = ' . $notice->profile_id . ' ' .
'AND user.jabber is not null ' .
- 'AND user.jabbernotify = 1 ');
+ 'AND user.jabbernotify = 1 ' .
+ 'AND subscription.jabber = 1 ');
while ($user->fetch()) {
if (!array_key_exists($user->id, $sent_to)) {
@@ -252,7 +253,7 @@ function jabber_broadcast_notice($notice) {
}
$user->free();
-
+
return true;
}