From 1517deeeb621a0256106d0108855e8827713e2cc Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 6 May 2017 15:25:44 +0200 Subject: [PATCH] Since ActivityContext::CONVERSATION changed to 'conversation' instead of 'ostatus:conversation' we need to add it ourselves the xmlstringerthinger doesn't really use namespaces afaik --- lib/activity.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/activity.php b/lib/activity.php index a52f29e9ca..daf9f4b22e 100644 --- a/lib/activity.php +++ b/lib/activity.php @@ -631,18 +631,18 @@ class Activity $convattr['href'] = $conv->getUrl(); $convattr['local_id'] = $conv->getID(); $convattr['ref'] = $conv->getUri(); - $xs->element('link', array('rel' => ActivityContext::CONVERSATION, + $xs->element('link', array('rel' => 'ostatus:'.ActivityContext::CONVERSATION, 'href' => $convattr['href'])); } else { $convattr['ref'] = $this->context->conversation; } - $xs->element(ActivityContext::CONVERSATION, + $xs->element('ostatus:'.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 - 'conversation', // tag (or the element name from ActivityContext::CONVERSATION) + ActivityContext::CONVERSATION, null, // attributes $this->context->conversation); // content */