X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fjabber.php;h=3cd3b0d37eda1bc8f62ed74afa1962cf38b7057c;hb=2133d5a4e7fc694b097fe65282e557d99ee109ad;hp=f41d984d6261a46698f11cf27de238d8698e3ce1;hpb=bb2cb65c2aa763c8b28c41b9811c6026a11482db;p=quix0rs-gnu-social.git
diff --git a/lib/jabber.php b/lib/jabber.php
index f41d984d62..3cd3b0d37e 100644
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -114,7 +114,7 @@ function jabber_connect($resource=null)
try {
$conn->connect(true); // true = persistent connection
} catch (XMPPHP_Exception $e) {
- common_log(LOG_ERROR, $e->getMessage());
+ common_log(LOG_ERR, $e->getMessage());
return false;
}
@@ -186,6 +186,11 @@ function jabber_format_entry($profile, $notice)
$entry .= "". $notice->uri . "\n";
$entry .= "".common_date_w3dtf($notice->created)."\n";
$entry .= "".common_date_w3dtf($notice->modified)."\n";
+ if ($notice->reply_to) {
+ $replyurl = common_local_url('shownotice',
+ array('notice' => $notice->reply_to));
+ $entry .= "\n";
+ }
$entry .= "\n";
$html = "\n\n";
@@ -405,8 +410,8 @@ function jabber_broadcast_notice($notice)
"ON $UT.id = notice_inbox.user_id " .
'WHERE notice_inbox.notice_id = ' . $notice->id . ' ' .
'AND notice_inbox.source = 2 ' .
- 'AND user.jabber is not null ' .
- 'AND user.jabbernotify = 1 ');
+ "AND $UT.jabber is not null " .
+ "AND $UT.jabbernotify = 1 ");
while ($user->fetch()) {
if (!array_key_exists($user->id, $sent_to)) {