From bbbbdabd22c3d54d12016171066b879e2688a48e Mon Sep 17 00:00:00 2001 From: Maximilian Fickers Date: Thu, 20 Feb 2025 14:52:49 +0100 Subject: [PATCH] Fix error on admin product edit page when all product attributes are globally scoped --- .../Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php b/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php index 16fcc4f207deb..a969b77034a80 100644 --- a/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php +++ b/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php @@ -157,6 +157,10 @@ private function initAttributeValues($entityType, $entity, $storeId) $selects[] = $select; } + if (empty($selects)) { + return; + } + $unionSelect = new \Magento\Framework\DB\Sql\UnionExpression( $selects, \Magento\Framework\DB\Select::SQL_UNION_ALL