Merge branch 'master' of git://gitorious.org/laconica/mainline
This commit is contained in:
commit
c6070200fe
@ -186,6 +186,11 @@ function jabber_format_entry($profile, $notice)
|
|||||||
$entry .= "<id>". $notice->uri . "</id>\n";
|
$entry .= "<id>". $notice->uri . "</id>\n";
|
||||||
$entry .= "<published>".common_date_w3dtf($notice->created)."</published>\n";
|
$entry .= "<published>".common_date_w3dtf($notice->created)."</published>\n";
|
||||||
$entry .= "<updated>".common_date_w3dtf($notice->modified)."</updated>\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";
|
$entry .= "</entry>\n";
|
||||||
|
|
||||||
$html = "\n<html xmlns='http://jabber.org/protocol/xhtml-im'>\n";
|
$html = "\n<html xmlns='http://jabber.org/protocol/xhtml-im'>\n";
|
||||||
|
Loading…
Reference in New Issue
Block a user