ENGCOM-4583: Fix eav form foreach error #21134 #21135

magento · Mar 28, 2019 · b6b74af · b6b74af
2 parents ecc8928 + 4efe0e5
commit b6b74af
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/app/code/Magento/Eav/Model/Form.php b/app/code/Magento/Eav/Model/Form.php
@@ -286,7 +286,8 @@ public function getFormCode()
     }
 
     /**
-     * Return entity type instance
+     * Return entity type instance.
+     *
      * Return EAV entity type if entity type is not defined
      *
      * @return \Magento\Eav\Model\Entity\Type
@@ -323,6 +324,8 @@ public function getAttributes()
         if ($this->_attributes === null) {
             $this->_attributes = [];
             $this->_userAttributes = [];
+            $this->_systemAttributes = [];
+            $this->_allowedAttributes = [];
             /** @var $attribute \Magento\Eav\Model\Attribute */
             foreach ($this->_getFilteredFormAttributeCollection() as $attribute) {
                 $this->_attributes[$attribute->getAttributeCode()] = $attribute;