Skip to content

Commit

Permalink
Merge forwardport of #12810 to 2.3-develop branch
Browse files Browse the repository at this point in the history
Applied pull request patch https://github.com/magento/magento2/pull/12810.patch (created by @nicka101) based on commit(s):
  1. 5f1b846
  • Loading branch information
magento-engcom-team authored Jan 24, 2018
2 parents 9c9ed91 + 07fa73a commit 4a422f6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions app/code/Magento/Eav/Model/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,7 @@ public function getAttribute($entityType, $code)
}

if (isset($this->attributes[$entityTypeCode][$code])) {
\Magento\Framework\Profiler::stop('EAV: ' . __METHOD__);
return $this->attributes[$entityTypeCode][$code];
}

Expand Down

0 comments on commit 4a422f6

Please sign in to comment.