Ensure store-scoped values are selected before default (#2966)

Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Co-authored-by: Colin Mollenhour <colin@mollenhour.com>

Author: 3 people

app/code/core/Mage/Catalog/Model/Resource/Abstract.php

@@ -117,6 +117,9 @@ protected function _getLoadAttributesSelect($object, $table)
             ->from(['attr_table' => $table], [])
             ->where("attr_table.{$this->getEntityIdField()} = ?", $object->getId())
             ->where('attr_table.store_id IN (?)', $storeIds);
+        if (count($storeIds) > 1) {
+            $select->order('attr_table.store_id ASC');
+        }
         if ($setId) {
             $select->join(
                 ['set_table' => $this->getTable('eav/entity_attribute')],