http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97284
Revision: 97284
Author: jeroendedauw
Date: 2011-09-16 15:04:49 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
use style args that are escaped; not strictrly needed here as the vars have
already been sanitized, but good practice won't hurt
Modified Paths:
--------------
trunk/extensions/Maps/includes/features/Maps_BaseMap.php
trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
trunk/extensions/Maps/includes/services/OSM/Maps_OSMDispMap.php
Modified: trunk/extensions/Maps/includes/features/Maps_BaseMap.php
===================================================================
--- trunk/extensions/Maps/includes/features/Maps_BaseMap.php 2011-09-16
15:01:15 UTC (rev 97283)
+++ trunk/extensions/Maps/includes/features/Maps_BaseMap.php 2011-09-16
15:04:49 UTC (rev 97284)
@@ -100,7 +100,12 @@
'div',
array(
'id' => $mapName,
- 'style' => "width: {$params['width']}; height:
{$params['height']}; background-color: #cccccc; overflow: hidden;",
+ 'style' => array(
+ 'width' => $params['width'],
+ 'height' => $params['height'],
+ 'background-color' => '#cccccc',
+ 'overflow' => 'hidden'
+ )
),
wfMsg( 'maps-loading-map' )
);
Modified: trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
===================================================================
--- trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
2011-09-16 15:01:15 UTC (rev 97283)
+++ trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
2011-09-16 15:04:49 UTC (rev 97284)
@@ -76,7 +76,12 @@
'div',
array(
'id' => $mapName,
- 'style' => "width: {$params['width']}; height:
{$params['height']}; background-color: #cccccc; overflow: hidden;",
+ 'style' => array(
+ 'width' => $params['width'],
+ 'height' => $params['height'],
+ 'background-color' => '#cccccc',
+ 'overflow' => 'hidden'
+ )
),
wfMsg( 'maps-loading-map' )
);
Modified: trunk/extensions/Maps/includes/services/OSM/Maps_OSMDispMap.php
===================================================================
--- trunk/extensions/Maps/includes/services/OSM/Maps_OSMDispMap.php
2011-09-16 15:01:15 UTC (rev 97283)
+++ trunk/extensions/Maps/includes/services/OSM/Maps_OSMDispMap.php
2011-09-16 15:04:49 UTC (rev 97284)
@@ -27,7 +27,11 @@
'iframe',
array(
'id' => $mapName,
- 'style' => "width: {$params['width']}; height:
{$params['height']}; clear: both;",
+ 'style' => array(
+ 'width' => $params['width'],
+ 'height' => $params['height'],
+ 'clear' => 'both'
+ ),
'src' =>
"http://toolserver.org/~kolossos/openlayers/kml-on-ol.php?zoom={$params['zoom']}&lat={$params['centre']['lat']}&lon={$params['centre']['lon']}&lang=$lang&thumbs=$thumbs&photo=$photos"
),
wfMsg( 'maps-loading-map' )
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
