Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 05:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into alt-description

Browse source
This commit is contained in:
Michael 2019-08-04 12:07:21 +00:00
commit d2b551a616
5 changed files with 76 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Content/Text/BBCode.php
View file

@ -1102,7 +1102,11 @@ class BBCode extends BaseObject
if (substr($curl_info["content_type"], 0, 6) == "image/") {
$text = "[img]" . $match[1] . "[/img]";
} else {
$text = "[img]" . $match[2] . "[/img]";
if (!empty($match[3])) {
$text = "[img=" . $match[2] . "]" . $match[3] . "[/img]";
} else {
$text = "[img]" . $match[2] . "[/img]";
}
// if its not a picture then look if its a page that contains a picture link
$body = Network::fetchUrl($match[1]);
@ -1120,7 +1124,11 @@ class BBCode extends BaseObject
}
if (strtolower($attr["name"]) == "twitter:image") {
$text = "[img]" . $attr["content"] . "[/img]";
if (!empty($match[3])) {
$text = "[img=" . $attr["content"] . "]" . $match[3] . "[/img]";
} else {
$text = "[img]" . $attr["content"] . "[/img]";
}
}
}
}
@ -1132,7 +1140,8 @@ class BBCode extends BaseObject
public static function cleanPictureLinks($text)
{
$return = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'self::cleanPictureLinksCallback', $text);
$return = preg_replace_callback("&\[url=([^\[\]]*)\]\[img=(.*)\](.*)\[\/img\]\[\/url\]&Usi", 'self::cleanPictureLinksCallback', $text);
$return = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'self::cleanPictureLinksCallback', $return);
return $return;
}