Merge commit 'upstream/master'

[friendica.git] / view / api_timeline_xml.tpl

diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl
old mode 100644 (file)
new mode 100755 (executable)
index 85f7306..17860ca
--- 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>
@@ -15,7 +16,7 @@
     <coordinates>$status.coordinates</coordinates>
     <place>$status.place</place>
     <contributors>$status.contributors</contributors>
-       {{ inc view/api_user_xml.tpl with $user=$status.user }}{{ endinc }}
+       {{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}
   </status>
   {{ endfor }}
 </statuses>
\ No newline at end of file