| Index: trunk/extensions/Maps/ParserFunctions/DisplayPoint/Maps_BasePointMap.php |
| — | — | @@ -25,14 +25,13 @@ |
| 26 | 26 | abstract class MapsBasePointMap extends MapsMapFeature implements iDisplayFunction { |
| 27 | 27 | |
| 28 | 28 | private $markerData = array(); |
| 29 | | - protected $markerStringFormat = ''; |
| 30 | 29 | protected $markerString; |
| 31 | 30 | |
| 32 | 31 | /** |
| 33 | 32 | * Handles the request from the parser hook by doing the work that's common for all |
| 34 | 33 | * mapping services, calling the specific methods and finally returning the resulting output. |
| 35 | 34 | * |
| 36 | | - * @param unknown_type $parser |
| | 35 | + * @param Parser $parser |
| 37 | 36 | * @param array $params |
| 38 | 37 | * |
| 39 | 38 | * @return html |
| Index: trunk/extensions/Maps/ParserFunctions/Maps_ParserFunctions.php |
| — | — | @@ -300,7 +300,7 @@ |
| 301 | 301 | public static function paramIsPresent( $paramName, array $stack, array $paramInfo = array(), $checkForAliases = true ) { |
| 302 | 302 | $isPresent = array_key_exists( $paramName, $stack ); |
| 303 | 303 | |
| 304 | | - if ( $checkForAliases && array_key_exists( 'aliases', $paramInfo[$paramName] ) ) { |
| | 304 | + if ( !$isPresent && $checkForAliases && array_key_exists( 'aliases', $paramInfo[$paramName] ) ) { |
| 305 | 305 | foreach ( $paramInfo[$paramName]['aliases'] as $alias ) { |
| 306 | 306 | if ( array_key_exists( $alias, $stack ) ) { |
| 307 | 307 | $isPresent = true; |
| Index: trunk/extensions/Maps/INSTALL |
| — | — | @@ -1,4 +1,4 @@ |
| 2 | | -[[Maps 0.5.5]] |
| | 2 | +[[Maps 0.6]] |
| 3 | 3 | |
| 4 | 4 | In order to use this version of Maps, you need to have Validator 0.2.2 installed. If you get a distribution |
| 5 | 5 | from this page, you don't need to bother this, since Validator comes bundled with every release, and will |