| Index: trunk/extensions/SemanticMaps/YahooMaps/SM_YahooMapsQP.php |
| — | — | @@ -67,13 +67,11 @@ |
| 68 | 68 | wfMsg('maps-loading-map') |
| 69 | 69 | ); |
| 70 | 70 | |
| 71 | | - $layerItems = MapsOpenLayers::createLayersStringAndLoadDependencies( $this->output, $this->layers ); |
| 72 | | - |
| 73 | 71 | $parser->getOutput()->addHeadItem( |
| 74 | 72 | Html::inlineScript( <<<EOT |
| 75 | 73 | addOnloadHook( |
| 76 | 74 | function() { |
| 77 | | - initOpenLayer( |
| | 75 | + initializeYahooMap( |
| 78 | 76 | '$this->mapName', |
| 79 | 77 | $this->centre_lat, |
| 80 | 78 | $this->centre_lon, |
| Index: trunk/extensions/SemanticMaps/QueryPrinters/SM_MapPrinter.php |
| — | — | @@ -94,7 +94,8 @@ |
| 95 | 95 | |
| 96 | 96 | $this->setCentre(); |
| 97 | 97 | |
| 98 | | - $this->addSpecificMapHTML(); |
| | 98 | + global $wgParser; |
| | 99 | + $this->addSpecificMapHTML( $wgParser ); |
| 99 | 100 | } |
| 100 | 101 | else { |
| 101 | 102 | // TODO: add warning when level high enough and append to error list? |
| — | — | @@ -239,8 +240,8 @@ |
| 240 | 241 | // TODO: add escaping to title and label (they are getting escaped now on some place where they shouldn't) |
| 241 | 242 | Xml::escapeJsString( $lat ), |
| 242 | 243 | Xml::escapeJsString( $lon ), |
| 243 | | - $title, |
| 244 | | - $text, |
| | 244 | + Xml::escapeJsString( $title ), |
| | 245 | + Xml::escapeJsString( $text ), |
| 245 | 246 | Xml::escapeJsString( $icon ) |
| 246 | 247 | ); |
| 247 | 248 | } |
| Index: trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMapsQP.php |
| — | — | @@ -92,8 +92,6 @@ |
| 93 | 93 | function() { |
| 94 | 94 | initializeGoogleMap('$this->mapName', |
| 95 | 95 | { |
| 96 | | - width: $this->width, |
| 97 | | - height: $this->height, |
| 98 | 96 | lat: $this->centre_lat, |
| 99 | 97 | lon: $this->centre_lon, |
| 100 | 98 | zoom: $this->zoom, |