Merge pull request #1 from AOEmedia/master

Fixed Aoe_Eav_Model_Config::getEntityAttributeCodes() method for case when entity type doesn't have attributes (some custom one) or there are no attributes in attribute set
Zyava · May 13, 2013 · 194e5e9 · 194e5e9
2 parents b5a6966 + 972e541
commit 194e5e9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/code/local/Aoe/Eav/Model/Config.php b/app/code/local/Aoe/Eav/Model/Config.php
@@ -357,7 +357,9 @@ public function getEntityAttributeCodes($entityType, $object = null)
         }
         Varien_Profiler::stop('EAV: ' . __METHOD__);
 
-        return $attributes;
+        // it might happen that entity type doesn't have attributes (some custom one) or
+        // there are no attributes in attribute set
+        return empty($attributes) ? array() : $attributes;
     }
 
     /**