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.

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

M2 5381 #10052

Merged
merged 2 commits into from
Jun 29, 2017
Merged

M2 5381 #10052

merged 2 commits into from
Jun 29, 2017

Conversation

tzyganu
Copy link
Contributor

@tzyganu tzyganu commented Jun 26, 2017

Description

This PR solves the issue #5381

Fixed Issues (if relevant)

  1. Cannot create a etc/view.xml file with an images tag with an attribute module other than Magento_Catalog #5381:Cannot create a etc/view.xml file with an images tag with an attribute module other than Magento_Catalog
  2. This PR modifies lib/internal/Magento/Framework/Config/etc/view.xsd and allows multiple imageType nodes inside view.xml files.
  3. This PR adds the member var imageBuilder that was not declared in Magento\Catalog\Block\Product\AbstractProduct

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

@okorshenko okorshenko self-assigned this Jun 26, 2017
@okorshenko okorshenko added this to the June 2017 milestone Jun 26, 2017
@magento-team magento-team merged commit cba9cfd into magento:develop Jun 29, 2017
magento-team pushed a commit that referenced this pull request Jun 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants