| Index: trunk/extensions/Maps/Features/DisplayPoint/Maps_BasePointMap.php |
| — | — | @@ -167,9 +167,14 @@ |
| 168 | 168 | * Fills the $markerData array with the locations and their meta data. |
| 169 | 169 | */ |
| 170 | 170 | private function setMarkerData() { |
| 171 | | - $this->title = $this->parser->recursiveTagParse( $this->title ); |
| 172 | | - $this->label = $this->parser->recursiveTagParse( $this->label ); |
| | 171 | + global $wgTitle; |
| 173 | 172 | |
| | 173 | + // New parser object to render popup contents with. |
| | 174 | + $parser = new Parser(); |
| | 175 | + |
| | 176 | + $this->title = $parser->parse( $this->title, $wgTitle, new ParserOptions() )->getText(); |
| | 177 | + $this->label = $parser->parse( $this->label, $wgTitle, new ParserOptions() )->getText(); |
| | 178 | + |
| 174 | 179 | // Each $args is an array containg the coordinate set as first element, possibly followed by meta data. |
| 175 | 180 | foreach ( $this->coordinates as $args ) { |
| 176 | 181 | $markerData = MapsCoordinateParser::parseCoordinates( array_shift( $args ) ); |
| — | — | @@ -178,11 +183,11 @@ |
| 179 | 184 | |
| 180 | 185 | if ( count( $args ) > 0 ) { |
| 181 | 186 | // Parse and add the point specific title if it's present. |
| 182 | | - $markerData['title'] = $this->parser->recursiveTagParse( $args[0] ); |
| | 187 | + $markerData['title'] = $parser->parse( $args[0], $wgTitle, new ParserOptions() )->getText(); |
| 183 | 188 | |
| 184 | 189 | if ( count( $args ) > 1 ) { |
| 185 | 190 | // Parse and add the point specific label if it's present. |
| 186 | | - $markerData['label'] = $this->parser->recursiveTagParse( $args[1] ); |
| | 191 | + $markerData['label'] = $parser->parse( $args[1], $wgTitle, new ParserOptions() )->getText(); |
| 187 | 192 | |
| 188 | 193 | if ( count( $args ) > 2 ) { |
| 189 | 194 | // Add the point specific icon if it's present. |