Eav config cache followup for multi scope load

app/code/core/Mage/Eav/Model/Config.php

@@ -209,7 +209,7 @@ protected function _loadEntityTypes()
     protected function _loadEntityAttributes($entityType, $storeId)
     {
         // preload attributes in array form to avoid instantiating models for every attribute even if it is never accessed
-        $entityAttributes = $entityType->getAttributeCollection()
+        $entityAttributes = $entityType->getAttributeCollection(null, false)
             ->addStoreLabel($storeId)
             ->getData();
 

app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php

@@ -438,6 +438,10 @@ public function addAttributeToSelect($attribute, $joinType = false)
             } else {
                 $attrInstance = Mage::getSingleton('eav/config')
                     ->getAttribute($this->getEntity()->getType(), $attribute);
+                // failure to resolve an attribute from the eav config implies it does not exist
+                if (empty($attrInstance)) {
+                    return $this;
+                }
             }
             if (empty($attrInstance)) {
                 throw Mage::exception(

app/code/core/Mage/Eav/Model/Entity/Type.php

@@ -99,24 +99,33 @@ public function loadByCode($code)
     /**
      * Retrieve entity type attributes collection
      *
-     * @param   int $setId
-     * @return  Mage_Eav_Model_Resource_Entity_Attribute_Collection
+     * @param int|null $setId
+     * @param bool $useCache reuse local cache for collection
+     * @return Mage_Eav_Model_Resource_Entity_Attribute_Collection
      */
-    public function getAttributeCollection($setId = null)
+    public function getAttributeCollection($setId = null, $useCache = true)
     {
-        if ($setId === null) {
-            if ($this->_attributes === null) {
-                $this->_attributes = $this->_getAttributeCollection()
-                    ->setEntityTypeFilter($this);
+        if ($useCache) {
+            if ($setId === null && $this->_attributes !== null) {
+                return $this->_attributes;
+            } elseif (isset($this->_attributesBySet[$setId])) {
+                return $this->_attributesBySet[$setId];
             }
-            $collection = $this->_attributes;
-        } else {
-            if (!isset($this->_attributesBySet[$setId])) {
-                $this->_attributesBySet[$setId] = $this->_getAttributeCollection()
-                    ->setEntityTypeFilter($this)
-                    ->setAttributeSetFilter($setId);
+        }
+
+        $collection = $this->_getAttributeCollection()
+            ->setEntityTypeFilter($this);
+
+        if ($setId !== null) {
+            $collection->setAttributeSetFilter($setId);
+        }
+
+        if ($useCache) {
+            if ($setId === null) {
+                $this->_attributes = $collection;
+            } else {
+                $this->_attributesBySet[$setId] = $collection;
             }
-            $collection = $this->_attributesBySet[$setId];
         }
 
         return $collection;