Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #6961 #6971

Merged
merged 2 commits into from
Mar 22, 2017
Merged

fix #6961 #6971

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d805bae
fix #6961
Oct 12, 2016
cfbe0a6
fix typo
Oct 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code is not even syntactically correct: https://travis-ci.org/magento/magento2/jobs/167057903#L825

Did you mean array here?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, yes, sorry

) . 'catalog/product/' . $this->getValue();
}
return $url;
Expand Down