From 0ce6cd7f5a21c5cb5a3eff32b4840181a34aeaa3 Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Wed, 16 Dec 2020 09:11:14 -0600 Subject: [PATCH] MC-39959: [AWS S3] Catalog grid is broken with dynamic tables --- .../Magento/Captcha/Cron/DeleteExpiredImages.php | 3 ++- .../Catalog/Model/Config/CatalogMediaConfig.php | 14 ++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Captcha/Cron/DeleteExpiredImages.php b/app/code/Magento/Captcha/Cron/DeleteExpiredImages.php index cb5f1c4547507..ffe46aa82dd6c 100644 --- a/app/code/Magento/Captcha/Cron/DeleteExpiredImages.php +++ b/app/code/Magento/Captcha/Cron/DeleteExpiredImages.php @@ -6,6 +6,7 @@ namespace Magento\Captcha\Cron; use Magento\Framework\App\Filesystem\DirectoryList; +use Magento\Framework\Filesystem\DriverPool; /** * Captcha cron actions @@ -48,7 +49,7 @@ public function __construct( ) { $this->_helper = $helper; $this->_adminHelper = $adminHelper; - $this->_mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA); + $this->_mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA, DriverPool::FILE); $this->_storeManager = $storeManager; } diff --git a/app/code/Magento/Catalog/Model/Config/CatalogMediaConfig.php b/app/code/Magento/Catalog/Model/Config/CatalogMediaConfig.php index 0ae128b34d348..aecb3da8fd3d5 100644 --- a/app/code/Magento/Catalog/Model/Config/CatalogMediaConfig.php +++ b/app/code/Magento/Catalog/Model/Config/CatalogMediaConfig.php @@ -16,8 +16,8 @@ class CatalogMediaConfig { private const XML_PATH_CATALOG_MEDIA_URL_FORMAT = 'web/url/catalog_media_url_format'; - const IMAGE_OPTIMIZATION_PARAMETERS = 'image_optimization_parameters'; - const HASH = 'hash'; + public const IMAGE_OPTIMIZATION_PARAMETERS = 'image_optimization_parameters'; + public const HASH = 'hash'; /** * @var ScopeConfigInterface @@ -41,10 +41,16 @@ public function __construct(ScopeConfigInterface $scopeConfig) */ public function getMediaUrlFormat($scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null): string { - return $this->scopeConfig->getValue( - CatalogMediaConfig::XML_PATH_CATALOG_MEDIA_URL_FORMAT, + $value = $this->scopeConfig->getValue( + self::XML_PATH_CATALOG_MEDIA_URL_FORMAT, $scopeType, $scopeCode ); + + if ($value === null) { + return self::HASH; + } + + return (string)$value; } }