Less greedy when replacing attachment elements

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 6da5b490586c8c23854ffa07b26cecca11d4e62d..44ef6e7f1b39341fc535f95f97d451fcd8dfe1ba 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -408,7 +408,7 @@ class BBCode
         */
        public static function removeAttachment($body, $no_link_desc = false)
        {
-               return preg_replace_callback("/\s*\[attachment (.*)\](.*?)\[\/attachment\]\s*/ism",
+               return preg_replace_callback("/\s*\[attachment (.*?)\](.*?)\[\/attachment\]\s*/ism",
                        function ($match) use ($no_link_desc) {
                                $attach_data = self::getAttachmentData($match[0]);
                                if (empty($attach_data['url'])) {

diff --git a/src/Model/Item.php b/src/Model/Item.php
index f387a1a7282aeb722a7f0b462c29106bde5d528e..f1ae16a05b281620df1c435dacc597f19dd6bc1e 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1706,7 +1706,7 @@ class Item
                                        return ("[bookmark=" . str_replace("#", "#", $match[1]) . "]" . str_replace("#", "#", $match[2]) . "[/bookmark]");
                                }, $body);
 
-                       $body = preg_replace_callback("/\[attachment (.*)\](.*?)\[\/attachment\]/ism",
+                       $body = preg_replace_callback("/\[attachment (.*?)\](.*?)\[\/attachment\]/ism",
                                function ($match) {
                                        return ("[attachment " . str_replace("#", "#", $match[1]) . "]" . $match[2] . "[/attachment]");
                                }, $body);
@@ -2640,7 +2640,7 @@ class Item
                }
 
                $orig_body = $item['body'];
-               $item['body'] = preg_replace("/\s*\[attachment .*\].*?\[\/attachment\]\s*/ism", '', $item['body']);
+               $item['body'] = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", '', $item['body']);
                self::putInCache($item);
                $item['body'] = $orig_body;
                $s = $item["rendered-html"];