MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml

Browse source
This commit is contained in:
Michael Vogel 2016-07-15 17:19:16 +02:00
parent 4e25d08a77 1130f11037
commit a64b7704d8
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

@ -3249,7 +3249,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);
@ -3288,6 +3287,8 @@
if (isset($data["url"])) if (isset($data["url"]))
$body .= "\n".$data["url"]; $body .= "\n".$data["url"];
$body .= $data["after"];
return $body; return $body;
} }