fix statusnet_html timelines on api

diff --git a/include/api.php b/include/api.php
index 6cd3318ef2e2a170185752f852927dbbbb8e255d..3c692cf741f4e3058e3b44230477a6751b2a8db0 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -740,7 +740,7 @@
                                'id'            => intval($item['id']),
                                'message_id' => $item['uri'],
                                'text'          => strip_tags(bbcode($item['body'])),
-                               'html'          => bbcode($item['body']),
+                               'statusnet_html'                => bbcode($item['body']),
                                'source'    => (($item['app']) ? $item['app'] : 'web'),
                                'url'           => ($item['plink']!=''?$item['plink']:$item['author-link']),
                                'truncated' => False,

diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl
index aef1f9310adda5d672c24b89a43793b1363fb08e..0e427feaaaf83b9907a5ceb6bf34304ccb7266c0 100644 (file)
--- a/view/api_timeline_atom.tpl
+++ b/view/api_timeline_atom.tpl
@@ -55,7 +55,7 @@
                <activity:object-type>$status.objecttype</activity:object-type>
                <id>$status.message_id</id>
                <title>$status.text</title>
-               <content type="html">$status.html</content>
+               <content type="html">$status.statusnet_html</content>
                <link rel="alternate" type="text/html" href="$status.url"/>
                <activity:verb>$status.verb</activity:verb>
                <published>$status.published</published>

diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl
index 9914f647591f8354f690631dfed5ed00d8a8a124..17860ca613cfd08b6c951536e650b36fb4f67247 100644 (file)
--- a/view/api_timeline_xml.tpl
+++ b/view/api_timeline_xml.tpl
@@ -4,6 +4,7 @@
     <created_at>$status.created_at</created_at>
     <id>$status.id</id>
     <text>$status.text</text>
+       <statusnet_html>$status.statusnet_html</statusnet_html>
     <source>$status.source</source>
     <truncated>$status.truncated</truncated>
     <url>$status.url</url>