Merge pull request #1025 from slirx/wrong-parameter-for-getbaseurl

vpelipenko · vpelipenko · commit a0727fb488b1 · 2015-02-13T12:41:14.000+02:00
Wrong parameter for getting base url for 'media' path in "Image" form element.
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Image.php b/lib/internal/Magento/Framework/Data/Form/Element/Image.php
@@ -50,7 +50,7 @@ public function getElementHtml()
             $url = $this->_getUrl();
 
             if (!preg_match("/^http\:\/\/|https\:\/\//", $url)) {
-                $url = $this->_urlBuilder->getBaseUrl('media') . $url;
+                $url = $this->_urlBuilder->getBaseUrl(['_type' => \Magento\Framework\UrlInterface::URL_TYPE_MEDIA]) . $url;
             }
 
             $html = '<a href="' .

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function getElementHtml()`
`50`	`50`	`$url = $this->_getUrl();`
`51`	`51`
`52`	`52`	`if (!preg_match("/^http\:\/\/\|https\:\/\//", $url)) {`
`53`		`- $url = $this->_urlBuilder->getBaseUrl('media') . $url;`
	`53`	`+ $url = $this->_urlBuilder->getBaseUrl(['_type' => \Magento\Framework\UrlInterface::URL_TYPE_MEDIA]) . $url;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`$html = '<a href="' .`