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

Merge pull request #6878 from friendica/MrPetovan-convert-attachment

Browse source 
Swap attachment conversion and autolinking in BBCode::convert
This commit is contained in:
Philipp 2019-03-14 09:05:54 +01:00 committed by GitHub
parent 65adce3442 4cafe11d4d
commit 140391fff1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1266,6 +1266,9 @@ class BBCode extends BaseObject
// Set up the parameters for a MAIL search string // Set up the parameters for a MAIL search string
$MAILSearchString = $URLSearchString; $MAILSearchString = $URLSearchString;
// Handle attached links or videos
$text = self::convertAttachment($text, $simple_html, $try_oembed);
// if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text // if the HTML is used to generate plain text, then don't do this search, but replace all URL of that kind to text
if (!$for_plaintext) { if (!$for_plaintext) {
$text = preg_replace(Strings::autoLinkRegEx(), '[url]$1[/url]', $text); $text = preg_replace(Strings::autoLinkRegEx(), '[url]$1[/url]', $text);
@ -1278,10 +1281,6 @@ class BBCode extends BaseObject
$text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'self::removePictureLinksCallback', $text); $text = preg_replace_callback("&\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]&Usi", 'self::removePictureLinksCallback', $text);
} }
// Handle attached links or videos
$text = self::convertAttachment($text, $simple_html, $try_oembed);
$text = str_replace(["\r","\n"], ['<br />', '<br />'], $text); $text = str_replace(["\r","\n"], ['<br />', '<br />'], $text);
// Remove all hashtag addresses // Remove all hashtag addresses