friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

workaround for issue #1134

This commit is contained in:
Fabrixxm 2014-10-23 16:27:30 +02:00
parent 8bf19aabb0
commit b1e83f331e
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/api.php
View File

@ -1838,7 +1838,17 @@
return($entities);
}
function api_format_items_embeded_images($item, $text){
$a = get_app();
$text = preg_replace_callback(
"|data:image/([^;]+)[^=]+=*|m",
function($match) use ($a, $item) {
return $a->get_baseurl()."/display/".$item['guid'];
},
$text);
return $text;
}
function api_format_items($r,$user_info, $filter_user = false) {
$a = get_app();
@ -1907,6 +1917,12 @@
if (($item["network"] == NETWORK_FEED) and (strlen($statustext)> 1000))
$statustext = substr($statustext, 0, 1000)."... \n".$item["plink"];
$statushtml = trim(bbcode($item['body'], false, false));
// handle data: images
$statustext = api_format_items_embeded_images($item,$statustext);
$status = array(
'text' => $statustext,
'truncated' => False,
@ -1924,7 +1940,7 @@
//'attachments' => array(),
'user' => $status_user ,
//'entities' => NULL,
'statusnet_html' => trim(bbcode($item['body'], false, false)),
'statusnet_html' => $statushtml,
'statusnet_conversation_id' => $item['parent'],
);
@ -2412,9 +2428,6 @@
function api_share_as_retweet($a, $uid, &$item) {
$body = trim($item["body"]);