remove duplicate tag in atom response

diff --git a/include/api.php b/include/api.php
index e5c1e55292bded19060b79eecfbfc6fc0d0b5cb3..556bc062278069771f601f97d30b21f959461f4d 100644 (file)
--- 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 cd91f7a97f3452a199f8feafc3f0ad7023474482..f9c70ebb5bd6f23c7b1052d2f52c42d3c61961d6 100644 (file)
--- 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 }}