| Index: trunk/extensions/Maps/Maps.php |
| — | — | @@ -287,8 +287,8 @@ |
| 288 | 288 | * @return true |
| 289 | 289 | */ |
| 290 | 290 | function efMapsSetup() { |
| | 291 | + global $wgLogRestrictions; |
| 291 | 292 | wfRunHooks( 'MappingServiceLoad' ); |
| 292 | 293 | wfRunHooks( 'MappingFeatureLoad' ); |
| 293 | | - |
| 294 | 294 | return true; |
| 295 | 295 | } |
| Index: trunk/extensions/Maps/includes/Maps_Geocoders.php |
| — | — | @@ -352,7 +352,8 @@ |
| 353 | 353 | if ( $geocoderIdentifier === '' || !array_key_exists( $geocoderIdentifier, self::$registeredGeocoders ) ) { |
| 354 | 354 | if ( !$validatedDefault ) { |
| 355 | 355 | if ( !array_key_exists( $egMapsDefaultGeoService, self::$registeredGeocoders ) ) { |
| 356 | | - $egMapsDefaultGeoService = array_shift( array_keys( self::$registeredGeocoders ) ); |
| | 356 | + $services = array_keys( self::$registeredGeocoders ); |
| | 357 | + $egMapsDefaultGeoService = array_shift( $services ); |
| 357 | 358 | if ( is_null( $egMapsDefaultGeoService ) ) { |
| 358 | 359 | throw new Exception( 'Tried to geocode while there are no geocoders available at ' . __METHOD__ ); |
| 359 | 360 | } |