Merge branch '1504-M2-repo-Insert-rendition-images-to-the-content-from-media-gallery-instead-of-original-images' of github.com:jmonteros422/magento2-1 into asi-delivery-24

Author: sivaschenko

app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php

@@ -8,6 +8,7 @@
 
 namespace Magento\Cms\Model\Wysiwyg\Images;
 
+use Magento\Catalog\Helper\Data as CatalogHelper;
 use Magento\Cms\Helper\Wysiwyg\Images as ImagesHelper;
 
 class GetInsertImageContent
@@ -18,13 +19,18 @@ class GetInsertImageContent
     private $imagesHelper;
 
     /**
-     * PrepareImage constructor.
-     *
+     * @var CatalogHelper
+     */
+    private $catalogHelper;
+
+    /**
      * @param ImagesHelper $imagesHelper
+     * @param CatalogHelper $catalogHelper
      */
-    public function __construct(ImagesHelper $imagesHelper)
+    public function __construct(ImagesHelper $imagesHelper, CatalogHelper $catalogHelper)
     {
         $this->imagesHelper = $imagesHelper;
+        $this->catalogHelper = $catalogHelper;
     }
 
     /**
@@ -44,6 +50,7 @@ public function execute(
     ): string {
         $filename = $this->imagesHelper->idDecode($encodedFilename);
 
+        $this->catalogHelper->setStoreId($storeId);
         $this->imagesHelper->setStoreId($storeId);
 
         if ($forceStaticPath) {