aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-16 08:42:15 +1100
committerfriendica <info@friendica.com>2014-03-16 08:42:15 +1100
commit548960ffa06a5737515f18d39371dfd750ef405d (patch)
tree27d854c5b8668470a3005425e428b8c115550aad
parent3cb179aff19d803b91261e410c50b36e4bae1246 (diff)
parent521b091779ddb2a4ca58c28af9312cb5bcf2dd9f (diff)
downloadvolse-hubzilla-548960ffa06a5737515f18d39371dfd750ef405d.tar.gz
volse-hubzilla-548960ffa06a5737515f18d39371dfd750ef405d.tar.bz2
volse-hubzilla-548960ffa06a5737515f18d39371dfd750ef405d.zip
Merge pull request #367 from cvogeley/master
API: statusnet_html:trim was trimming too much
-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'],
);