Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,9 @@ public function setMediaAttribute(\Magento\Catalog\Model\Product $product, $medi
$mediaAttributeCodes = $this->mediaConfig->getMediaAttributeCodes();

if (is_array($mediaAttribute)) {
foreach ($mediaAttribute as $atttribute) {
if (in_array($atttribute, $mediaAttributeCodes)) {
$product->setData($atttribute, $value);
foreach ($mediaAttribute as $attribute) {
if (in_array($attribute, $mediaAttributeCodes)) {
$product->setData($attribute, $value);
}
}
} elseif (in_array($mediaAttribute, $mediaAttributeCodes)) {
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/Magento/Framework/Code/GeneratedFiles.php
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ private function disableAllCacheTypes()
}

/**
* Enables apppropriate cache types in app/etc/env.php based on the passed in $cacheTypes array
* Enables appropriate cache types in app/etc/env.php based on the passed in $cacheTypes array
* TODO: to be removed in scope of MAGETWO-53476
*
* @param string[] $cacheTypes
Expand Down
2 changes: 1 addition & 1 deletion lib/web/modernizr/modernizr.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ window.Modernizr = (function( window, document, undefined ) {
// isEventSupported determines if a given element supports the given event
// kangax.github.com/iseventsupported/
//
// The following results are known incorrects:
// The following results are known incorrect:
// Modernizr.hasEvent("webkitTransitionEnd", elem) // false negative
// Modernizr.hasEvent("textInput") // in Webkit. github.com/Modernizr/Modernizr/issues/333
// ...
Expand Down