http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74053
Revision: 74053
Author: jeroendedauw
Date: 2010-10-01 05:19:19 +0000 (Fri, 01 Oct 2010)
Log Message:
-----------
Follow up to r74052 and fixed copy-paste error causing wrong default value for
Yahoo! Maps zoom level
Modified Paths:
--------------
trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMapsDispMap.php
trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMapsDispPoint.php
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3DispMap.php
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3DispPoint.php
trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayersDispPoint.php
trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMapsDispMap.php
trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMapsDispPoint.php
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMapsDispMap.php
===================================================================
---
trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMapsDispMap.php
2010-10-01 03:59:02 UTC (rev 74052)
+++
trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMapsDispMap.php
2010-10-01 05:19:19 UTC (rev 74053)
@@ -30,7 +30,7 @@
wfMsg( 'maps-loading-map' )
);
- MapsMapper::addInlineScript( <<<EOT
+ MapsMapper::addInlineScript( $parser, <<<EOT
initializeGoogleMap("$mapName",
{
lat: $this->centreLat,
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMapsDispPoint.php
===================================================================
---
trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMapsDispPoint.php
2010-10-01 03:59:02 UTC (rev 74052)
+++
trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMapsDispPoint.php
2010-10-01 05:19:19 UTC (rev 74053)
@@ -32,7 +32,7 @@
wfMsg( 'maps-loading-map' )
);
- MapsMapper::addInlineScript( <<<EOT
+ MapsMapper::addInlineScript( $parser, <<<EOT
initializeGoogleMap("$mapName",
{
lat: $this->centreLat,
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3DispMap.php
===================================================================
---
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3DispMap.php
2010-10-01 03:59:02 UTC (rev 74052)
+++
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3DispMap.php
2010-10-01 05:19:19 UTC (rev 74053)
@@ -37,7 +37,7 @@
null
);
- MapsMapper::addInlineScript( <<<EOT
+ MapsMapper::addInlineScript( $parser, <<<EOT
initGMap3(
"$mapName",
{
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3DispPoint.php
===================================================================
---
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3DispPoint.php
2010-10-01 03:59:02 UTC (rev 74052)
+++
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3DispPoint.php
2010-10-01 05:19:19 UTC (rev 74053)
@@ -12,10 +12,9 @@
/**
* @see MapsBaseMap::addSpecificMapHTML
- *
*/
public function addSpecificMapHTML( Parser $parser ) {
- $mapName = $this->service->getMapId();;
+ $mapName = $this->service->getMapId();
$this->output .= Html::element(
'div',
@@ -26,7 +25,7 @@
null
);
- MapsMapper::addInlineScript( <<<EOT
+ MapsMapper::addInlineScript( $parser, <<<EOT
initGMap3(
"$mapName",
{
Modified:
trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayersDispPoint.php
===================================================================
---
trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayersDispPoint.php
2010-10-01 03:59:02 UTC (rev 74052)
+++
trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayersDispPoint.php
2010-10-01 05:19:19 UTC (rev 74053)
@@ -31,7 +31,7 @@
$langCode = $wgLang->getCode();
- MapsMapper::addInlineScript( <<<EOT
+ MapsMapper::addInlineScript( $parser, <<<EOT
initOpenLayer(
"$mapName",
$this->centreLon,
Modified: trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
===================================================================
--- trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
2010-10-01 03:59:02 UTC (rev 74052)
+++ trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
2010-10-01 05:19:19 UTC (rev 74053)
@@ -98,8 +98,8 @@
* @since 0.6.5
*/
public function getDefaultZoom() {
- global $egMapsYahooMapsTypes;
- return $egMapsYahooMapsTypes;
+ global $egMapsYahooMapsZoom;
+ return $egMapsYahooMapsZoom;
}
/**
Modified:
trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMapsDispMap.php
===================================================================
--- trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMapsDispMap.php
2010-10-01 03:59:02 UTC (rev 74052)
+++ trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMapsDispMap.php
2010-10-01 05:19:19 UTC (rev 74053)
@@ -30,7 +30,7 @@
wfMsg( 'maps-loading-map' )
);
- MapsMapper::addInlineScript( <<<EOT
+ MapsMapper::addInlineScript( $parser, <<<EOT
initializeYahooMap(
"$mapName",
$this->centreLat,
Modified:
trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMapsDispPoint.php
===================================================================
---
trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMapsDispPoint.php
2010-10-01 03:59:02 UTC (rev 74052)
+++
trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMapsDispPoint.php
2010-10-01 05:19:19 UTC (rev 74053)
@@ -25,7 +25,7 @@
wfMsg( 'maps-loading-map' )
);
- MapsMapper::addInlineScript( <<<EOT
+ MapsMapper::addInlineScript( $parser, <<<EOT
initializeYahooMap(
"$mapName",
$this->centreLat,
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
