| Index: trunk/extensions/Maps/ParserFunctions/DisplayPoint/Maps_DisplayPoint.php |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | */ |
| 28 | 28 | function efMapsDisplayPointMagic( &$magicWords, $langCode ) { |
| 29 | 29 | // The display_address(es) aliases are for backward compatibility only, and will be removed eventually. |
| 30 | | - $magicWords['display_point'] = array( 0, 'display_point', 'display_points', 'display_address', 'display_addresses' ); |
| | 30 | + $magicWords['display_point'] = array( 0, 'display_point', 'display_points' ); |
| 31 | 31 | |
| 32 | 32 | return true; // Unless we return true, other parser functions won't get loaded. |
| 33 | 33 | } |
| Index: trunk/extensions/Maps/ParserFunctions/DisplayPoint/Maps_BasePointMap.php |
| — | — | @@ -15,8 +15,8 @@ |
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | 18 | * Abstract class MapsBasePointMap provides the scafolding for classes handling display_point(s) |
| 19 | | - * and display_address(es) calls for a spesific mapping service. It inherits from MapsMapFeature and therefore |
| 20 | | - * forces inheriting classes to implement sereveral methods. |
| | 19 | + * calls for a spesific mapping service. It inherits from MapsMapFeature and therefore forces |
| | 20 | + * inheriting classes to implement sereveral methods. |
| 21 | 21 | * |
| 22 | 22 | * @ingroup Maps |
| 23 | 23 | * |
| Index: trunk/extensions/Maps/ParserFunctions/Maps_ParserFunctions.php |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | |
| 44 | 44 | // Go through the parser functions supported by the mapping service, and load their classes. |
| 45 | 45 | foreach($serviceData['pf'] as $parser_name => $parser_data) { |
| 46 | | - $file = $parser_data['local'] ? $egMapsDir . $parser_data['file'] : $IP . '/extensions/' . $parser_data['file']; |
| | 46 | + $file = array_key_exists('local', $parser_data) && $parser_data['local'] ? $egMapsDir . $parser_data['file'] : $IP . '/extensions/' . $parser_data['file']; |
| 47 | 47 | $wgAutoloadClasses[$parser_data['class']] = $file; |
| 48 | 48 | } |
| 49 | 49 | } |
| — | — | @@ -159,7 +159,7 @@ |
| 160 | 160 | * |
| 161 | 161 | * @return array |
| 162 | 162 | */ |
| 163 | | - private static function filterInvalidCoords(&$coordList, $delimeter = ';') { |
| | 163 | + public static function filterInvalidCoords(&$coordList, $delimeter = ';') { |
| 164 | 164 | $coordFails = array(); |
| 165 | 165 | $validCoordinates = array(); |
| 166 | 166 | $coordinates = explode($delimeter, $coordList); |
| — | — | @@ -257,7 +257,7 @@ |
| 258 | 258 | * |
| 259 | 259 | * @return class |
| 260 | 260 | */ |
| 261 | | - private static function getParserClassInstance($service, $parserFunction) { |
| | 261 | + public static function getParserClassInstance($service, $parserFunction) { |
| 262 | 262 | global $egMapsServices; |
| 263 | 263 | return new $egMapsServices[$service]['pf'][$parserFunction]['class'](); |
| 264 | 264 | } |
| — | — | @@ -273,7 +273,7 @@ |
| 274 | 274 | * |
| 275 | 275 | * @return boolean |
| 276 | 276 | */ |
| 277 | | - private static function inParamAliases($name, $mainParamName, array $paramInfo = array(), $compareMainName = true) { |
| | 277 | + public static function inParamAliases($name, $mainParamName, array $paramInfo = array(), $compareMainName = true) { |
| 278 | 278 | $equals = $compareMainName && $mainParamName == $name; |
| 279 | 279 | |
| 280 | 280 | if (array_key_exists($mainParamName, $paramInfo)) { |
| 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.5.4 rc1'); |
| | 37 | + define('Maps_VERSION', '0.5.4'); |
| 38 | 38 | |
| 39 | 39 | $egMapsScriptPath = (isset($wgExtensionAssetsPath) && $wgExtensionAssetsPath ? $wgExtensionAssetsPath : $wgScriptPath . '/extensions') . '/Maps'; |
| 40 | 40 | $egMapsDir = dirname( __FILE__ ) . '/'; |