aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-05 07:26:54 -0700
committerFriendika <info@friendika.com>2011-08-05 07:26:54 -0700
commit8ae0a8a94c359769662b1907abb518b3f51912aa (patch)
tree5d1418a4f9bc144c6bdbaa1af2e4915303b61f8b
parent1d659bd8543c630ff1eda245ab7e9afeec6eebe1 (diff)
downloadvolse-hubzilla-8ae0a8a94c359769662b1907abb518b3f51912aa.tar.gz
volse-hubzilla-8ae0a8a94c359769662b1907abb518b3f51912aa.tar.bz2
volse-hubzilla-8ae0a8a94c359769662b1907abb518b3f51912aa.zip
fix statusnet_html timelines on api
-rw-r--r--include/api.php2
-rw-r--r--view/api_timeline_atom.tpl2
-rw-r--r--view/api_timeline_xml.tpl1
3 files changed, 3 insertions, 2 deletions
diff --git a/include/api.php b/include/api.php
index 6cd3318ef..3c692cf74 100644
--- 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 aef1f9310..0e427feaa 100644
--- 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 9914f6475..17860ca61 100644
--- 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>