FIX Merge options recursively (BetterBrief#3)

dhensby · dhensby · commit 4d6c26e6c3e3 · 2013-10-04T00:03:42.000+01:00
Fixes BetterBrief#3 see BetterBrief#10
diff --git a/code/GoogleMapField.php b/code/GoogleMapField.php
@@ -57,7 +57,7 @@ public function Field($properties = array()) {
 			),
 		);
 
-		$jsOptions = array_merge($jsOptions, $this->options);
+		$jsOptions = array_replace_recursive($jsOptions, $this->options);
 		$this->setAttribute('data-settings', Convert::array2json($jsOptions));
 		return parent::Field($properties);
 	}

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function Field($properties = array()) {`
`57`	`57`	`),`
`58`	`58`	`);`
`59`	`59`
`60`		`- $jsOptions = array_merge($jsOptions, $this->options);`
	`60`	`+ $jsOptions = array_replace_recursive($jsOptions, $this->options);`
`61`	`61`	`$this->setAttribute('data-settings', Convert::array2json($jsOptions));`
`62`	`62`	`return parent::Field($properties);`
`63`	`63`	`}`