http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72487
Revision: 72487
Author: jeroendedauw
Date: 2010-09-06 12:25:25 +0000 (Mon, 06 Sep 2010)
Log Message:
-----------
Changes for 0.7 - Fixed JS inclusion after moving the files
Modified Paths:
--------------
trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
Modified: trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
===================================================================
--- trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
2010-09-06 12:22:08 UTC (rev 72486)
+++ trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
2010-09-06 12:25:25 UTC (rev 72487)
@@ -272,7 +272,7 @@
return array(
Html::linkedScript(
"http://maps.google.com/maps?file=api&v=2&key=$egGoogleMapsKey&hl=$langCode"; ),
- Html::linkedScript(
"$egMapsScriptPath/Services/GoogleMaps/GoogleMapFunctions{$egMapsJsExt}?$egMapsStyleVersion"
),
+ Html::linkedScript(
"$egMapsScriptPath/includes/services/GoogleMaps/GoogleMapFunctions{$egMapsJsExt}?$egMapsStyleVersion"
),
Html::inlineScript( 'window.unload = GUnload;' )
);
}
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
===================================================================
--- trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
2010-09-06 12:22:08 UTC (rev 72486)
+++ trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
2010-09-06 12:25:25 UTC (rev 72487)
@@ -175,7 +175,7 @@
return array(
Html::linkedScript(
"http://maps.google.com/maps/api/js?sensor=false&language=$languageCode"; ),
- Html::linkedScript(
"$egMapsScriptPath/Services/GoogleMaps3/GoogleMap3Functions{$egMapsJsExt}?$egMapsStyleVersion"
),
+ Html::linkedScript(
"$egMapsScriptPath/includes/services/GoogleMaps3/GoogleMap3Functions{$egMapsJsExt}?$egMapsStyleVersion"
),
);
}
Modified: trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
===================================================================
--- trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
2010-09-06 12:22:08 UTC (rev 72486)
+++ trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
2010-09-06 12:25:25 UTC (rev 72487)
@@ -132,9 +132,9 @@
global $egMapsStyleVersion, $egMapsJsExt, $egMapsScriptPath;
return array(
- Html::linkedStyle(
"$egMapsScriptPath/Services/OpenLayers/OpenLayers/theme/default/style.css" ),
- Html::linkedScript(
"$egMapsScriptPath/Services/OpenLayers/OpenLayers/OpenLayers.js?$egMapsStyleVersion"
),
- Html::linkedScript(
"$egMapsScriptPath/Services/OpenLayers/OpenLayerFunctions{$egMapsJsExt}?$egMapsStyleVersion"
),
+ Html::linkedStyle(
"$egMapsScriptPath/includes/services/OpenLayers/OpenLayers/theme/default/style.css"
),
+ Html::linkedScript(
"$egMapsScriptPath/includes/services/OpenLayers/OpenLayers/OpenLayers.js?$egMapsStyleVersion"
),
+ Html::linkedScript(
"$egMapsScriptPath/includes/services/OpenLayers/OpenLayerFunctions{$egMapsJsExt}?$egMapsStyleVersion"
),
Html::inlineScript( 'initOLSettings(200, 100); var
msgMarkers = ' . Xml::encodeJsVar( wfMsg( 'maps-markers' ) ) . ';' )
);
}
Modified: trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
===================================================================
--- trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
2010-09-06 12:22:08 UTC (rev 72486)
+++ trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
2010-09-06 12:25:25 UTC (rev 72487)
@@ -154,7 +154,7 @@
return array(
Html::linkedScript(
"http://api.maps.yahoo.com/ajaxymap?v=3.8&appid=$egYahooMapsKey"; ),
- Html::linkedScript(
"$egMapsScriptPath/Services/YahooMaps/YahooMapFunctions{$egMapsJsExt}?$egMapsStyleVersion"
),
+ Html::linkedScript(
"$egMapsScriptPath/includes/services/YahooMaps/YahooMapFunctions{$egMapsJsExt}?$egMapsStyleVersion"
),
);
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
