Merge branch '1.4' into 1

BetterBrief · Nov 28, 2017 · 2473e42 · 2473e42
2 parents b8ceba1 + 40cd880
commit 2473e42
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/code/GoogleMapField.php b/code/GoogleMapField.php
@@ -149,7 +149,7 @@ public function Field($properties = array()) {
 			),
 		);
 
-		$jsOptions = array_replace_recursive($this->options, $jsOptions);
+		$jsOptions = array_replace_recursive($jsOptions, $this->options);
 		$this->setAttribute('data-settings', Convert::array2json($jsOptions));
 		$this->requireDependencies();
 		return parent::Field($properties);