Merge remote-tracking branch 'origin/MC-31763' into 2.4-develop-pr14

serhii-balko · serhii-balko · commit 714642fda899 · 2020-02-25T13:24:24.000+02:00
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -67,7 +67,8 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
 
         $labels = [];
         foreach ((array) $attributeValue as $value) {
-            $labels[] = (array) $this->getOptionText($value);
+            $label = $this->getOptionText($value);
+            $labels[] = is_array($label) ? $label : [$label];
         }
         $label = implode(',', array_unique(array_merge(...$labels)));
         $this->getLayer()

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,8 @@ public function apply(\Magento\Framework\App\RequestInterface $request)`
`67`	`67`
`68`	`68`	`$labels = [];`
`69`	`69`	`foreach ((array) $attributeValue as $value) {`
`70`		`- $labels[] = (array) $this->getOptionText($value);`
	`70`	`+ $label = $this->getOptionText($value);`
	`71`	`+ $labels[] = is_array($label) ? $label : [$label];`
`71`	`72`	`}`
`72`	`73`	`$label = implode(',', array_unique(array_merge(...$labels)));`
`73`	`74`	`$this->getLayer()`