aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/api.php1
-rw-r--r--view/api_timeline_atom.tpl3
2 files changed, 1 insertions, 3 deletions
diff --git a/include/api.php b/include/api.php
index e5c1e5529..556bc0622 100644
--- a/include/api.php
+++ b/include/api.php
@@ -515,7 +515,6 @@
'user' => $status_user ,
'objecttype' => $item['object-type'],
'verb' => $item['verb'],
- 'conversation' => $a->get_baseurl() . '/display/' . $status_user['screen_name'] . '/' . $item['id'],
'self' => $a->get_baseurl()."/api/statuses/show/".$ite['id'].".".$type,
'edit' => $a->get_baseurl()."/api/statuses/show/".$ite['id'].".".$type,
);
diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl
index cd91f7a97..f9c70ebb5 100644
--- a/view/api_timeline_atom.tpl
+++ b/view/api_timeline_atom.tpl
@@ -61,7 +61,6 @@
<published>$status.published</published>
<updated>$status.updated</updated>
- <link rel="ostatus:conversation" href="$status.url"/>
<!--
<source>
<id>http://identi.ca/api/statuses/user_timeline/397830.atom</id>
@@ -119,7 +118,7 @@
</poco:urls>
<!-- <statusnet:profile_info local_id="123710" following="true" blocking="false"></statusnet:profile_info> -->
</activity:actor>
- <link rel="ostatus:conversation" href="$status.conversation"/>
+ <link rel="ostatus:conversation" href="$status.url"/>
</entry>
{{ endfor }}