Corrected classes and search patterns

Author: sivaschenko

app/code/Magento/MediaContent/Model/ExtractAssetsFromContent.php

@@ -63,7 +63,7 @@ public function execute(string $content): array
             preg_match_all($pattern, $content, $matches, PREG_PATTERN_ORDER);
 
             if (!empty($matches[1])) {
-                $paths += array_unique($matches[1]);
+                $paths = array_merge($paths, array_unique($matches[1]));
             }
         }
 
@@ -81,6 +81,8 @@ private function getAssetsByPaths(array $paths): array
         $assets = [];
 
         foreach ($paths as $path) {
+            $path = htmlspecialchars_decode($path);
+            $path = trim($path, '"\'');
             try {
                 /** @var AssetInterface $asset */
                 $asset = $this->getMediaAssetByPath->execute($this->getPathStartingWithSlash($path));
@@ -101,6 +103,10 @@ private function getAssetsByPaths(array $paths): array
      */
     private function getPathStartingWithSlash(string $path): string
     {
-        return '/' . ltrim($path, '/');
+        $normalizedPath = ltrim($path, '/');
+        if (strpos($normalizedPath, '/')) {
+            return $normalizedPath;
+        }
+        return '/' . $normalizedPath;
     }
 }

app/code/Magento/MediaContentCms/Observer/Block.php

@@ -7,7 +7,7 @@
 
 namespace Magento\MediaContentCms\Observer;
 
-use Magento\Cms\Block\Block as CmsBlock;
+use Magento\Cms\Model\Block as CmsBlock;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\MediaContentApi\Api\UpdateContentAssetLinksInterface;

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

@@ -9,6 +9,7 @@
     <search>
         <patterns>
             <pattern name="media_gallery">/{{media url="?(.*?)"?}}/</pattern>
+            <pattern name="wysiwyg">/src=".*\/media\/(.*?)"/</pattern>
         </patterns>
     </search>
 </config>