Backport 2.2 - Don't set a source model on the attribute when it's no…

…t needed. This avoids accidentally persisting the source model to the database when using multiselect attributes. (cherry picked from commit 477ca51)
miguelbalparda · Oct 4, 2018 · 3e066db · 3e066db
1 parent c34ced3
commit 3e066db
Showing 1 changed file with 4 additions and 2 deletions.
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(
                     __(