Skip to content

Commit ae83efa

Browse files
committed
Merge remote-tracking branch 'origin/AC-14011' into spartans_pr_10112025
2 parents 58e91e6 + 76095a7 commit ae83efa

File tree

2 files changed

+386
-0
lines changed

2 files changed

+386
-0
lines changed

app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ public function containsValue($entityType, $entity, $attributeCode, $storeId)
105105
* @return array
106106
*
107107
* @deprecated 101.0.0
108+
* @see MAGETWO-71174
108109
*/
109110
public function getDefaultValues($entityType, $entity)
110111
{
@@ -157,6 +158,10 @@ private function initAttributeValues($entityType, $entity, $storeId)
157158
$selects[] = $select;
158159
}
159160

161+
if (empty($selects)) {
162+
return;
163+
}
164+
160165
$unionSelect = new \Magento\Framework\DB\Sql\UnionExpression(
161166
$selects,
162167
\Magento\Framework\DB\Select::SQL_UNION_ALL

0 commit comments

Comments
 (0)