ACP2E-2974

o-dubovyk · o-dubovyk · commit 2196f95f7459 · 2024-05-21T16:10:09.000-05:00
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/OptionValueProvider.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/OptionValueProvider.php
@@ -51,13 +51,10 @@ public function get(int $optionId): ?string
             ->where('option_id = ?', $optionId);
 
         $records = $this->connection->fetchAssoc($select);
-        if (!empty($records)) {
-            return $records[$storeId]['value'];
+        if (empty($records)) {
+            return null;
         }
-//        if ($result !== false) {
-//            return $result;
-//        }
 
-        return null;
+        return $records[$storeId]['value'] ?? $records[0]['value'];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,10 @@ public function get(int $optionId): ?string`
`51`	`51`	`->where('option_id = ?', $optionId);`
`52`	`52`
`53`	`53`	`$records = $this->connection->fetchAssoc($select);`
`54`		`- if (!empty($records)) {`
`55`		`- return $records[$storeId]['value'];`
	`54`	`+ if (empty($records)) {`
	`55`	`+ return null;`
`56`	`56`	`}`
`57`		`-// if ($result !== false) {`
`58`		`-// return $result;`
`59`		`-// }`
`60`	`57`
`61`		`- return null;`
	`58`	`+ return $records[$storeId]['value'] ?? $records[0]['value'];`
`62`	`59`	`}`
`63`	`60`	`}`