| Index: trunk/extensions/GoogleMaps/GoogleMaps.body.php |
| — | — | @@ -510,7 +510,7 @@ |
| 511 | 511 | } |
| 512 | 512 | |
| 513 | 513 | // need to create this icon, since we haven't already |
| 514 | | - if( $icon && !$icons[$icon] ) { |
| | 514 | + if( $icon && !isset($icons[$icon]) ) { |
| 515 | 515 | $exporter->addIcon($icon, $o); |
| 516 | 516 | $icons[$icon] = true; |
| 517 | 517 | } |
| — | — | @@ -681,7 +681,7 @@ |
| 682 | 682 | |
| 683 | 683 | // our defaults, in case $wgGoogleMapsDefaults isn't specified. |
| 684 | 684 | $o = array( |
| 685 | | - 'api' => 2.108, |
| | 685 | + 'api' => '2.140', |
| 686 | 686 | 'color' => '#758bc5', |
| 687 | 687 | 'controls' => 'medium', |
| 688 | 688 | 'doubleclick' => 'recenter', |
| Index: trunk/extensions/GoogleMaps/export/GoogleMapsImgExporter.php |
| — | — | @@ -15,6 +15,7 @@ |
| 16 | 16 | $width = $o['width'] > 512 ? 512 : $o['width']; |
| 17 | 17 | $height = $o['height'] > 512 ? 512 : $o['height']; |
| 18 | 18 | $this->mOutput .= '<img '; |
| | 19 | + $this->mOutput .= "alt=\"Map\" "; |
| 19 | 20 | $this->mOutput .= "height=\"{$height}\" width=\"{$width}\" "; |
| 20 | 21 | $this->mOutput .= 'src="http://maps.google.com/staticmap'; |
| 21 | 22 | $this->mOutput .= "?center={$o['lat']}%2C{$o['lon']}"; |
| Index: trunk/extensions/GoogleMaps/export/GoogleMapsJsExporter.php |
| — | — | @@ -15,8 +15,7 @@ |
| 16 | 16 | function addXmlSource($url) { |
| 17 | 17 | $url = addslashes($url); |
| 18 | 18 | $this->mOutput .= <<<JAVASCRIPT |
| 19 | | - geoxml = new GGeoXml("{$url}"); |
| 20 | | - map.addOverlay(geoxml); |
| | 19 | + map.addOverlay(new GGeoXml("{$url}".replace(/&/g, "&".charAt(0)))); /* HACK HACK HACK */ |
| 21 | 20 | JAVASCRIPT; |
| 22 | 21 | } |
| 23 | 22 | |
| Index: trunk/extensions/GoogleMaps/GoogleMaps.php |
| — | — | @@ -5,9 +5,9 @@ |
| 6 | 6 | # Copyright Evan Miller (emmiller@gmail.com) |
| 7 | 7 | # Modifications copyright Joshua Hodge |
| 8 | 8 | |
| 9 | | -# Version 0.9.4a, 2 Jun 2008 |
| | 9 | +# Version 0.9.4, 27 Jan 2009 |
| 10 | 10 | |
| 11 | | -define('GOOGLE_MAPS_EXTENSION_VERSION', '0.9.4a'); |
| | 11 | +define('GOOGLE_MAPS_EXTENSION_VERSION', '0.9.4'); |
| 12 | 12 | |
| 13 | 13 | // if we're not in the mediawiki framework just die |
| 14 | 14 | if( !defined( 'MEDIAWIKI' ) ) { |
| — | — | @@ -185,7 +185,7 @@ |
| 186 | 186 | // extension credits |
| 187 | 187 | $wgExtensionCredits['other'][] = array( |
| 188 | 188 | 'name' => 'Google Maps Extension', |
| 189 | | - 'author' => 'Evan Miller', |
| | 189 | + 'author' => '[http://www.evanmiller.org/ Evan Miller]', |
| 190 | 190 | 'version' => GOOGLE_MAPS_EXTENSION_VERSION, |
| 191 | 191 | 'url' => 'http://www.mediawiki.org/wiki/Extension:Google_Maps', |
| 192 | 192 | 'description' => 'Easily create maps with wiki-fied markers', |
| Index: trunk/extensions/GoogleMaps/SpecialGoogleMapsKML.php |
| — | — | @@ -8,6 +8,9 @@ |
| 9 | 9 | // Easy links to KML files |
| 10 | 10 | |
| 11 | 11 | class GoogleMapsKML extends SpecialPage { |
| | 12 | + function GoogleMapsKML() { |
| | 13 | + parent::SpecialPage('Google Maps KML', '', false /* listed */); |
| | 14 | + } |
| 12 | 15 | function execute( $params ) { |
| 13 | 16 | global $wgRequest, $wgOut, $wgTitle, $wgUser; |
| 14 | 17 | global $wgContLang, $wgProxyKey, $wgParser; |