Swap attachment conversion and autolinking in BBCode::convert
- Fixes a rare display bug where an attachment description ends with a text URL
This commit is contained in:
parent
65adce3442
commit
4cafe11d4d
|
@ -1266,6 +1266,9 @@ class BBCode extends BaseObject
|
|||
// Set up the parameters for a MAIL search string
|
||||
$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 (!$for_plaintext) {
|
||||
$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);
|
||||
}
|
||||
|
||||
|
||||
// Handle attached links or videos
|
||||
$text = self::convertAttachment($text, $simple_html, $try_oembed);
|
||||
|
||||
$text = str_replace(["\r","\n"], ['<br />', '<br />'], $text);
|
||||
|
||||
// Remove all hashtag addresses
|
||||
|
|
Loading…
Reference in a new issue