strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2680 from fabrixxm/feature-api-update

Browse source 
API: fix plaintext of reshared attachment
This commit is contained in:
Michael Vogel 2016-07-15 16:58:59 +02:00 committed by GitHub
commit 1130f11037
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/api.php
View file

@ -3184,7 +3184,6 @@
$include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false"); $include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false");
$Text = bb_CleanPictureLinks($Text); $Text = bb_CleanPictureLinks($Text);
$URLSearchString = "^\[\]"; $URLSearchString = "^\[\]";
$Text = preg_replace("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'$1$3',$Text); $Text = preg_replace("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'$1$3',$Text);
@ -3223,6 +3222,8 @@
if (isset($data["url"])) if (isset($data["url"]))
$body .= "\n".$data["url"]; $body .= "\n".$data["url"];
$body .= $data["after"];
return $body; return $body;
} }