Index: trunk/extensions/Maps/Includes/Maps_CoordinateParser.php |
— | — | @@ -514,6 +514,7 @@ |
515 | 515 | */ |
516 | 516 | public static function parseAndFormat( $coordinates, $targetFormat = Maps_COORDS_FLOAT, $directional = false ) { |
517 | 517 | $parsedCoords = self::parseCoordinates( $coordinates ); |
| 518 | + |
518 | 519 | if ( $parsedCoords ) { |
519 | 520 | return self::formatCoordinates( $parsedCoords ); |
520 | 521 | } else { |
Index: trunk/extensions/Maps/Maps.php |
— | — | @@ -33,7 +33,7 @@ |
34 | 34 | echo '<b>Warning:</b> You need to have <a href="http://www.mediawiki.org/wiki/Extension:Validator">Validator</a> installed in order to use <a href="http://www.mediawiki.org/wiki/Extension:Maps">Maps</a>.'; |
35 | 35 | } |
36 | 36 | else { |
37 | | - define( 'Maps_VERSION', '0.6.3 a3' ); |
| 37 | + define( 'Maps_VERSION', '0.6.3 a4' ); |
38 | 38 | |
39 | 39 | // The different coordinate notations. |
40 | 40 | define( 'Maps_COORDS_FLOAT', 'float' ); |
— | — | @@ -93,13 +93,13 @@ |
94 | 94 | wfLoadExtensionMessages( 'Maps' ); |
95 | 95 | } |
96 | 96 | |
97 | | - wfRunHooks( 'MappingFeatureLoad' ); |
98 | | - |
99 | 97 | // Load the service/ classes and interfaces. |
100 | 98 | require_once $egMapsDir . 'Services/Maps_iMappingService.php'; |
101 | 99 | $wgAutoloadClasses['MapsMappingService'] = $egMapsDir . 'Services/Maps_MappingService.php'; |
102 | 100 | |
103 | | - wfRunHooks( 'MappingServiceLoad' ); |
| 101 | + wfRunHooks( 'MappingServiceLoad' ); |
| 102 | + |
| 103 | + wfRunHooks( 'MappingFeatureLoad' ); |
104 | 104 | |
105 | 105 | // Remove all hooked in services that should not be available. |
106 | 106 | foreach ( $egMapsServices as $service => $data ) { |