Swap attachment conversion and autolinking in BBCode::convert

- Fixes a rare display bug where an attachment description ends with a text URL

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 2d1c681f4f204fb17038501808c1a51e0f1ca36b..5474be98d837565673622c1c1caf7a088c408874 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -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