http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72014
Revision: 72014
Author: jeroendedauw
Date: 2010-08-31 05:03:41 +0000 (Tue, 31 Aug 2010)
Log Message:
-----------
Fixed bug introduced in r72009
Modified Paths:
--------------
trunk/extensions/Maps/Includes/Maps_Mapper.php
trunk/extensions/Maps/Maps_Settings.php
Modified: trunk/extensions/Maps/Includes/Maps_Mapper.php
===================================================================
--- trunk/extensions/Maps/Includes/Maps_Mapper.php 2010-08-31 04:33:04 UTC
(rev 72013)
+++ trunk/extensions/Maps/Includes/Maps_Mapper.php 2010-08-31 05:03:41 UTC
(rev 72014)
@@ -81,7 +81,7 @@
*/
public static function formatLocation( &$location, $name, array
$parameters ) {
if ( self::geocoderIsAvailable() ) {
- $location = MapsGeocoder::attemptToGeocodeToString(
$location, $parameters['geoservice']['value'],
$parameters['mappingservice']['value'] );
+ $location = MapsGeocoders::attemptToGeocodeToString(
$location, $parameters['geoservice']['value'],
$parameters['mappingservice']['value'] );
} else {
$location = MapsCoordinateParser::parseAndFormat(
$location );
}
@@ -173,7 +173,7 @@
}
/**
- * Returns a boolean indicating if MapsGeocoder is available.
+ * Returns a boolean indicating if MapsGeocoders is available.
*
* @deprecated - use MapsGeocoders::canGeocode() instead
*
Modified: trunk/extensions/Maps/Maps_Settings.php
===================================================================
--- trunk/extensions/Maps/Maps_Settings.php 2010-08-31 04:33:04 UTC (rev
72013)
+++ trunk/extensions/Maps/Maps_Settings.php 2010-08-31 05:03:41 UTC (rev
72014)
@@ -54,10 +54,17 @@
# Geocoders
+ # Registration of the GeoNames service geocoder.
$wgHooks['GeocoderFirstCallInit'][] =
'MapsGeonamesGeocoder::register';
+
+ # Registration of the Google Geocoding (v2) service geocoder.
$wgHooks['GeocoderFirstCallInit'][] =
'MapsGoogleGeocoder::register';
+
+ # Registration of the Yahoo! Geocoding service geocoder.
$wgHooks['GeocoderFirstCallInit'][] =
'MapsYahooGeocoder::register';
+
+
# Mapping services configuration
# Note: You can not use aliases in the settings. Use the main service names.
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
