aboutsummaryrefslogtreecommitdiffstats
path: root/include/api.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-16 14:56:37 -0700
committerfriendica <info@friendica.com>2014-03-16 14:56:37 -0700
commitbc467205a299267012c092b7d08efde1387ae31c (patch)
treebd679dcbeffd74d5dcdb1f9fcde81d80e287ad5d /include/api.php
parent074d2839c00aeb1400021e2cdbe432e87e0397b9 (diff)
parent548960ffa06a5737515f18d39371dfd750ef405d (diff)
downloadvolse-hubzilla-bc467205a299267012c092b7d08efde1387ae31c.tar.gz
volse-hubzilla-bc467205a299267012c092b7d08efde1387ae31c.tar.bz2
volse-hubzilla-bc467205a299267012c092b7d08efde1387ae31c.zip
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'include/api.php')
-rw-r--r--include/api.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/api.php b/include/api.php
index 47c78113a..f39039332 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1552,7 +1552,8 @@ require_once('include/items.php');
'geo' => '',
'favorited' => (($item['item_flags'] & ITEM_STARRED) ? true : false),
'user' => $status_user ,
- 'statusnet_html' => trim(prepare_text($item['body']),$item['mimetype']),
+ //'statusnet_html' => trim(prepare_text($item['body']),$item['mimetype']),
+ 'statusnet_html' => trim(prepare_text($item['body'])),
'statusnet_conversation_id' => $item['parent'],
);