diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-02-26 13:22:51 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-02-26 13:22:51 -0800 |
| commit | 34a61b40f47a52d1fdcf7cd907f3ac53b96b038e (patch) | |
| tree | 14ddeb18d9e020760d8c2308a12d858b6eab4a17 /lib/jabber.php | |
| parent | 478192fa3b2375a0ff0a5ff03956381e5da7a6ac (diff) | |
| parent | 8c3fe83c645265a11a3fca80cac2ac48ea72cdab (diff) | |
Merge branch '0.7.x' into 0.8.x
Diffstat (limited to 'lib/jabber.php')
| -rw-r--r-- | lib/jabber.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/jabber.php b/lib/jabber.php index f41d984d6..3fbb3e1ab 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 .= "<id>". $notice->uri . "</id>\n"; $entry .= "<published>".common_date_w3dtf($notice->created)."</published>\n"; $entry .= "<updated>".common_date_w3dtf($notice->modified)."</updated>\n"; + if ($notice->reply_to) { + $replyurl = common_local_url('shownotice', + array('notice' => $notice->reply_to)); + $entry .= "<link rel='related' href='" . $replyurl . "'/>\n"; + } $entry .= "</entry>\n"; $html = "\n<html xmlns='http://jabber.org/protocol/xhtml-im'>\n"; |