ENGCOM-5048: Fixed #22484 Customer address States are duplicated in backend #22637

magento-engcom-team · magento-engcom-team · commit c909537fed1e · 2019-05-04T01:57:26.000-05:00
- Merge Pull Request #22637 from opencommerce/magento2:2.3-developPr22484 - Merged commits: 1. 4a3fb1f
diff --git a/app/code/Magento/Ui/Component/Form/Element/AbstractOptionsField.php b/app/code/Magento/Ui/Component/Form/Element/AbstractOptionsField.php
@@ -59,7 +59,7 @@ public function prepare()
             if (empty($config['rawOptions'])) {
                 $options = $this->convertOptionsValueToString($options);
             }
-            $config['options'] = array_values(array_merge_recursive($config['options'], $options));
+            $config['options'] = array_values(array_replace_recursive($config['options'], $options));
         }
         $this->setData('config', (array)$config);
         parent::prepare();

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function prepare()`
`59`	`59`	`if (empty($config['rawOptions'])) {`
`60`	`60`	`$options = $this->convertOptionsValueToString($options);`
`61`	`61`	`}`
`62`		`- $config['options'] = array_values(array_merge_recursive($config['options'], $options));`
	`62`	`+ $config['options'] = array_values(array_replace_recursive($config['options'], $options));`
`63`	`63`	`}`
`64`	`64`	`$this->setData('config', (array)$config);`
`65`	`65`	`parent::prepare();`