r57641 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r57640‎ | r57641 | r57642 >
Date:17:14, 11 October 2009
Author:jeroendedauw
Status:deferred
Tags:
Comment:
Small bugfix to OSM format
Modified paths:
  • /trunk/extensions/Maps/Maps.php (modified) (history)
  • /trunk/extensions/Maps/OpenLayers/Maps_OpenLayersUtils.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Maps/OpenLayers/Maps_OpenLayersUtils.php
@@ -30,7 +30,7 @@
3131 */
3232 public static function loadDependencyWhenNeeded(&$output, $layer) {
3333 global $wgJsMimeType;
34 - global $egGoogleMapsOnThisPage, $egMapsIncludePath;
 34+ global $egGoogleMapsOnThisPage, $egMapsScriptPath;
3535
3636 switch ($layer) {
3737 case 'google' : case 'google-normal' : case 'google-sattelite' : case 'google-hybrid' : case 'google-physical' :
@@ -49,7 +49,7 @@
5050 if (!self::$loadedOL) { $output .= "<script type='$wgJsMimeType' src='http://clients.multimap.com/API/maps/1.1/metacarta_04'></script>\n"; self::$loadedOL = true; }
5151 break;
5252 case 'osm' : case 'openstreetmap' :
53 - if (!self::$loadedOSM) { $output .= "<script type='$wgJsMimeType' src='$egMapsIncludePath/OpenLayers/OSM/OpenStreetMap.js'></script>\n"; self::$loadedOSM = true; }
 53+ if (!self::$loadedOSM) { $output .= "<script type='$wgJsMimeType' src='$egMapsScriptPath/OpenLayers/OSM/OpenStreetMap.js'></script>\n"; self::$loadedOSM = true; }
5454 break;
5555 }
5656 }
Index: trunk/extensions/Maps/Maps.php
@@ -23,7 +23,7 @@
2424 die( 'Not an entry point.' );
2525 }
2626
27 -define('Maps_VERSION', '0.3.5 a2');
 27+define('Maps_VERSION', '0.3.5 a3');
2828
2929 $egMapsScriptPath = $wgScriptPath . '/extensions/Maps';
3030 $egMapsIP = $IP . '/extensions/Maps';

Status & tagging log