Merge branch 'ACP2E-1886' of https://github.com/magento-l3/magento2ce into PR-L3-2023-05-11

Author: vkolesny

app/code/Magento/MediaGalleryRenditions/etc/media_content.xml

@@ -9,7 +9,7 @@
     <search>
         <patterns>
             <pattern name="media_gallery_renditions">/{{media url=(?:"|&amp;quot;)(?:.renditions)?(.*?)(?:"|&amp;quot;)}}/</pattern>
-            <pattern name="media_gallery">/{{media url="?(?:.*?\.renditions\/)(.*?)"?}}/</pattern>
+            <pattern name="media_gallery">/{{media url="?(?:.*?\.renditions\/)?(.*?)"?}}/</pattern>
             <pattern name="wysiwyg">/src=".*\/media\/(?:.renditions\/)*(.*?)"/</pattern>
             <pattern name="catalog_image">/^\/?media\/(?:.renditions\/)?(.*)/</pattern>
             <pattern name="catalog_image_with_pub">/^\/pub\/?media\/(?:.renditions\/)?(.*)/</pattern>

dev/tests/integration/testsuite/Magento/MediaContent/Model/ExtractAssetsFromContentTest.php

@@ -77,6 +77,12 @@ public function contentProvider()
                     2020
                 ]
             ],
+            'Relevant paths in content without quotes' => [
+                'content {{media url=testDirectory/path.jpg}} content',
+                [
+                    2020
+                ]
+            ],
             'Relevant wysiwyg paths in content' => [
                 'content <img src="https://domain.com/media/testDirectory/path.jpg"}} content',
                 [