http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65436
Revision: 65436
Author: jeroendedauw
Date: 2010-04-22 19:51:41 +0000 (Thu, 22 Apr 2010)
Log Message:
-----------
Changes for 0.6 - Fixed some bugs
Modified Paths:
--------------
trunk/extensions/Maps/Features/Maps_ParserFunctions.php
trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispPoint.php
Modified: trunk/extensions/Maps/Features/Maps_ParserFunctions.php
===================================================================
--- trunk/extensions/Maps/Features/Maps_ParserFunctions.php 2010-04-22
19:46:04 UTC (rev 65435)
+++ trunk/extensions/Maps/Features/Maps_ParserFunctions.php 2010-04-22
19:51:41 UTC (rev 65436)
@@ -61,10 +61,10 @@
foreach( $args as $arg ) {
$split = explode( '=', $arg );
$name = strtolower( trim( array_shift( $split ) ) );
- if ( count( $split ) > 1 && self::inParamAliases(
$name, 'service', MapsMapper::getCommonParameters() ) ) {
+ if ( count( $split ) > 0 && self::inParamAliases(
$name, 'service', MapsMapper::getCommonParameters() ) ) {
if ( !$setService ) {
$service = implode( '=', $split );
- $parameters = 'service=' . $service;
+ $parameters[] = 'service=' . $service;
$setService = true;
}
} else {
@@ -73,7 +73,6 @@
}
$service = MapsMapper::getValidService( $setService ? $service
: '', $parserFunction );
-
$mapClass = new
$egMapsServices[$service]['features'][$parserFunction]();
$manager = new ValidatorManager();
Modified: trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispPoint.php
===================================================================
--- trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispPoint.php
2010-04-22 19:46:04 UTC (rev 65435)
+++ trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayersDispPoint.php
2010-04-22 19:51:41 UTC (rev 65436)
@@ -33,7 +33,7 @@
* @see MapsBaseMap::doMapServiceLoad()
*
*/
- protected function doMapServiceLoad() {
+ public function doMapServiceLoad() {
global $egOpenLayersOnThisPage;
MapsOpenLayers::addOLDependencies( $this->output );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
