From d805baea0b783abe39af1d9ae8740a0d421d5995 Mon Sep 17 00:00:00 2001 From: Aleksey Razbakov Date: Wed, 12 Oct 2016 15:43:06 +0200 Subject: [PATCH 1/2] fix #6961 --- .../Catalog/Block/Adminhtml/Product/Helper/Form/Image.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php index 8fc1e26f0cb7f..4cd5dd6e8cb67 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php @@ -21,7 +21,7 @@ protected function _getUrl() $url = false; if ($this->getValue()) { $url = $this->_urlBuilder->getBaseUrl( - \Magento\Framework\UrlInterface::URL_TYPE_MEDIA + '_type' => \Magento\Framework\UrlInterface::URL_TYPE_MEDIA ) . 'catalog/product/' . $this->getValue(); } return $url; From cfbe0a6becd3ce6cb94325d0eb4ad4772fab70d1 Mon Sep 17 00:00:00 2001 From: Aleksey Razbakov Date: Thu, 13 Oct 2016 18:41:32 +0200 Subject: [PATCH 2/2] fix typo --- .../Catalog/Block/Adminhtml/Product/Helper/Form/Image.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php index 4cd5dd6e8cb67..17fc0fa3cda7e 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php @@ -21,7 +21,7 @@ protected function _getUrl() $url = false; if ($this->getValue()) { $url = $this->_urlBuilder->getBaseUrl( - '_type' => \Magento\Framework\UrlInterface::URL_TYPE_MEDIA + ['_type' => \Magento\Framework\UrlInterface::URL_TYPE_MEDIA] ) . 'catalog/product/' . $this->getValue(); } return $url;