Index: trunk/extensions/Maps/includes/features/Maps_BasePointMap.php |
— | — | @@ -115,9 +115,12 @@ |
116 | 116 | private function setMarkerData( Parser $parser, PPFrame $frame = null ) { |
117 | 117 | global $wgTitle; |
118 | 118 | |
119 | | - $this->title = $parser->recursiveTagParse( $this->title, $frame ); |
120 | | - $this->label = $parser->recursiveTagParse( $this->label, $frame ); |
| 119 | + // New parser object to render popup contents with. |
| 120 | + $parser = new Parser(); |
121 | 121 | |
| 122 | + $this->title = $parser->parse( $this->title, $wgTitle, new ParserOptions() )->getText(); |
| 123 | + $this->label = $parser->parse( $this->label, $wgTitle, new ParserOptions() )->getText(); |
| 124 | + |
122 | 125 | // Each $args is an array containg the coordinate set as first element, possibly followed by meta data. |
123 | 126 | foreach ( $this->coordinates as $args ) { |
124 | 127 | $markerData = MapsCoordinateParser::parseCoordinates( array_shift( $args ) ); |
— | — | @@ -128,11 +131,11 @@ |
129 | 132 | |
130 | 133 | if ( count( $args ) > 0 ) { |
131 | 134 | // Parse and add the point specific title if it's present. |
132 | | - $markerData['title'] = $parser->recursiveTagParse( $args[0], $frame ); |
| 135 | + $markerData['title'] = $parser->parse( $args[0], $wgTitle, new ParserOptions() )->getText(); |
133 | 136 | |
134 | 137 | if ( count( $args ) > 1 ) { |
135 | 138 | // Parse and add the point specific label if it's present. |
136 | | - $markerData['label'] = $parser->recursiveTagParse( $args[1], $frame ); |
| 139 | + $markerData['label'] = $parser->parse( $args[1], $wgTitle, new ParserOptions() )->getText(); |
137 | 140 | |
138 | 141 | if ( count( $args ) > 2 ) { |
139 | 142 | // Add the point specific icon if it's present. |