@@ -179,8 +179,8 @@ |
||
| 179 | 179 | $gmapsParams['key'] = $key; |
| 180 | 180 | } |
| 181 | 181 | $this->extend('updateGoogleMapsParams', $gmapsParams); |
| 182 | - Requirements::css('betterbrief/silverstripe-googlemapfield: client/css/GoogleMapField.css'); |
|
| 183 | - Requirements::javascript('betterbrief/silverstripe-googlemapfield: client/js/GoogleMapField.js'); |
|
| 182 | + Requirements::css('betterbrief/silverstripe-googlemapfield: client/css/GoogleMapField.css'); |
|
| 183 | + Requirements::javascript('betterbrief/silverstripe-googlemapfield: client/js/GoogleMapField.js'); |
|
| 184 | 184 | Requirements::javascript('//maps.googleapis.com/maps/api/js?' . http_build_query($gmapsParams)); |
| 185 | 185 | } |
| 186 | 186 | |
@@ -71,8 +71,7 @@ discard block |
||
| 71 | 71 | if(isset($options[$name])) { |
| 72 | 72 | if(is_array($value)) { |
| 73 | 73 | $value = array_merge($value, $options[$name]); |
| 74 | - } |
|
| 75 | - else { |
|
| 74 | + } else { |
|
| 76 | 75 | $value = $options[$name]; |
| 77 | 76 | } |
| 78 | 77 | } |
@@ -234,7 +233,9 @@ discard block |
||
| 234 | 233 | public function getOption($name) { |
| 235 | 234 | // Quicker execution path for "."-free names |
| 236 | 235 | if (strpos($name, '.') === false) { |
| 237 | - if (isset($this->options[$name])) return $this->options[$name]; |
|
| 236 | + if (isset($this->options[$name])) { |
|
| 237 | + return $this->options[$name]; |
|
| 238 | + } |
|
| 238 | 239 | } else { |
| 239 | 240 | $names = explode('.', $name); |
| 240 | 241 | |