GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' into mmn_fixes

This commit is contained in:
Mikael Nordfeldth 2016-04-18 16:10:50 +02:00
parent 0959efd7be 844fe3924e
commit 9b613029e6
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/activity.php
View File

@ -625,9 +625,20 @@ class Activity
}
if (!empty($this->context->conversation)) {
$xs->element('link', array('rel' => ActivityContext::CONVERSATION,
'href' => $this->context->conversation));
$xs->element(ActivityContext::CONVERSATION, null, $this->context->conversation);
$convattr = [];
$conv = Conversation::getKV('uri', $this->context->conversation);
if ($conv instanceof Conversation) {
$convattr['href'] = $conv->getUrl();
$convattr['local_id'] = $conv->getID();
$convattr['ref'] = $conv->getUri();
$xs->element('link', array('rel' => ActivityContext::CONVERSATION,
'href' => $convattr['href']));
} else {
$convattr['ref'] = $this->context->conversation;
}
$xs->element(ActivityContext::CONVERSATION,
$convattr,
$this->context->conversation);
/* Since we use XMLWriter we just use the previously hardcoded prefix for ostatus,
otherwise we should use something like this:
$xs->elementNS(array(ActivityContext::OSTATUS => 'ostatus'), // namespace