Merge branch 'main' into phpstan-1

Author: sreichel

.all-contributorsrc

@@ -1679,6 +1679,16 @@
       "contributions": [
         "review"
       ]
+    },
+    {
+      "login": "gdemarsico",
+      "name": "Gastón De Mársico",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2066819?v=4",
+      "profile": "https://github.com/gdemarsico",
+      "contributions": [
+        "code",
+        "bug"
+      ]
     }
   ],
   "commitType": "docs"

README.md

@@ -271,6 +271,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/magentox"><img src="https://avatars.githubusercontent.com/u/44047835?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>magentox</b></sub></a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/stasadev"><img src="https://avatars.githubusercontent.com/u/24270994?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Stanislav Zhuk</b></sub></a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Axepih"><img src="https://avatars.githubusercontent.com/u/95623175?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Axepih</b></sub></a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gdemarsico"><img src="https://avatars.githubusercontent.com/u/2066819?v=4" loading="lazy" width="100" alt=""/><br /><sub><b>Gastón De Mársico</b></sub></a></td>
     </tr>
   </tbody>
 </table>

app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php

@@ -1520,7 +1520,7 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
             // optimize if using cat index
             $filters = $this->_productLimitationFilters;
             if (isset($filters['category_id']) || isset($filters['visibility'])) {
-                $this->getSelect()->order('cat_index.position ' . $dir);
+                $this->getSelect()->order(['cat_index.position ' . $dir, 'e.entity_id ' . $dir]);
             } else {
                 $this->getSelect()->order('e.entity_id ' . $dir);
             }

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

@@ -224,9 +224,16 @@ 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->newAttributeCollection()
-            ->addStoreLabel($storeId)
-            ->getData();
+        $collection = $entityType->newAttributeCollection()
+            ->addStoreLabel($storeId);
+
+        // if collection supports per-website values, set website id
+        if ($collection instanceof Mage_Eav_Model_Resource_Attribute_Collection) {
+            $websiteId = Mage::app()->getStore($storeId)->getWebsiteId();
+            $collection->setWebsite($websiteId);
+        }
+
+        $entityAttributes = $collection->getData();
 
         $this->_entityTypeAttributes[$storeId][$entityType->getId()] = [];
         $attributeCodes = [];

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

@@ -140,7 +140,8 @@ public function newAttributeCollection($setId = null)
      */
     protected function _getAttributeCollection()
     {
-        $collection = Mage::getModel('eav/entity_attribute')->getCollection();
+        $collectionClass = $this->getEntityAttributeCollection();
+        $collection = Mage::getResourceModel($collectionClass);
         $objectsModel = $this->getAttributeModel();
         if ($objectsModel) {
             $collection->setModel($objectsModel);