ENGCOM-3128: Backport 2.2 - Don't set a source model on the attribute when it's no… #18390

magento-engcom-team · magento-engcom-team · commit 08042f4ff606 · 2018-10-08T02:22:20.000-05:00
- Merge Pull Request #18390 from hostep/magento2:fix-for-issue-13156-for-2.2 - Merged commits: 1. 3e066db
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
@@ -594,9 +594,11 @@ public function getSource()
     {
         if (empty($this->_source)) {
             if (!$this->getSourceModel()) {
-                $this->setSourceModel($this->_getDefaultSourceModel());
+                $this->_source = $this->_getDefaultSourceModel();
+            } else {
+                $this->_source = $this->getSourceModel();
             }
-            $source = $this->_universalFactory->create($this->getSourceModel());
+            $source = $this->_universalFactory->create($this->_source);
             if (!$source) {
                 throw new LocalizedException(
                     __(

Original file line number	Diff line number	Diff line change
`@@ -594,9 +594,11 @@ public function getSource()`
`594`	`594`	`{`
`595`	`595`	`if (empty($this->_source)) {`
`596`	`596`	`if (!$this->getSourceModel()) {`
`597`		`- $this->setSourceModel($this->_getDefaultSourceModel());`
	`597`	`+ $this->_source = $this->_getDefaultSourceModel();`
	`598`	`+ } else {`
	`599`	`+ $this->_source = $this->getSourceModel();`
`598`	`600`	`}`
`599`		`- $source = $this->_universalFactory->create($this->getSourceModel());`
	`601`	`+ $source = $this->_universalFactory->create($this->_source);`
`600`	`602`	`if (!$source) {`
`601`	`603`	`throw new LocalizedException(`
`602`	`604`	`__(`