http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74054
Revision: 74054
Author: jeroendedauw
Date: 2010-10-01 05:24:06 +0000 (Fri, 01 Oct 2010)
Log Message:
-----------
Changes for 0.7 - replaced some globals by static vars
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/OSM/Maps_OSM.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-10-01 05:19:19 UTC (rev 74053)
+++ trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php
2010-10-01 05:24:06 UTC (rev 74054)
@@ -127,13 +127,14 @@
* @since 0.6.5
*/
public function getMapId( $increment = true ) {
- global $egMapsGoogleMapsPrefix, $egGoogleMapsOnThisPage;
+ global $egMapsGoogleMapsPrefix;
+ static $mapsOnThisPage = 0;
if ( $increment ) {
- $egGoogleMapsOnThisPage++;
+ $mapsOnThisPage++;
}
- return $egMapsGoogleMapsPrefix . '_' . $egGoogleMapsOnThisPage;
+ return $egMapsGoogleMapsPrefix . '_' . $mapsOnThisPage;
}
/**
Modified:
trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
===================================================================
--- trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
2010-10-01 05:19:19 UTC (rev 74053)
+++ trunk/extensions/Maps/includes/services/GoogleMaps3/Maps_GoogleMaps3.php
2010-10-01 05:24:06 UTC (rev 74054)
@@ -61,13 +61,14 @@
* @since 0.6.5
*/
public function getMapId( $increment = true ) {
- global $egMapsGoogleMaps3Prefix, $egGoogleMaps3OnThisPage;
+ global $egMapsGoogleMaps3Prefix;
+ static $mapsOnThisPage = 0;
if ( $increment ) {
- $egGoogleMaps3OnThisPage++;
+ $mapsOnThisPage++;
}
- return $egMapsGoogleMaps3Prefix . '_' .
$egGoogleMaps3OnThisPage;
+ return $egMapsGoogleMaps3Prefix . '_' . $mapsOnThisPage;
}
/**
Modified: trunk/extensions/Maps/includes/services/OSM/Maps_OSM.php
===================================================================
--- trunk/extensions/Maps/includes/services/OSM/Maps_OSM.php 2010-10-01
05:19:19 UTC (rev 74053)
+++ trunk/extensions/Maps/includes/services/OSM/Maps_OSM.php 2010-10-01
05:24:06 UTC (rev 74054)
@@ -41,13 +41,14 @@
* @since 0.6.5
*/
public function getMapId( $increment = true ) {
- global $egMapsOSMPrefix, $egOSMOnThisPage;
+ global $egMapsOSMPrefix;
+ static $mapsOnThisPage = 0;
if ( $increment ) {
- $egOSMOnThisPage++;
+ $mapsOnThisPage++;
}
- return $egMapsOSMPrefix . '_' . $egOSMOnThisPage;
+ return $egMapsOSMPrefix . '_' . $mapsOnThisPage;
}
}
\ No newline at end of file
Modified: trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
===================================================================
--- trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
2010-10-01 05:19:19 UTC (rev 74053)
+++ trunk/extensions/Maps/includes/services/OpenLayers/Maps_OpenLayers.php
2010-10-01 05:24:06 UTC (rev 74054)
@@ -88,13 +88,14 @@
* @since 0.6.5
*/
public function getMapId( $increment = true ) {
- global $egMapsOpenLayersPrefix, $egOpenLayersOnThisPage;
+ global $egMapsOpenLayersPrefix;
+ static $mapsOnThisPage = 0;
if ( $increment ) {
- $egOpenLayersOnThisPage++;
+ $mapsOnThisPage++;
}
- return $egMapsOpenLayersPrefix . '_' . $egOpenLayersOnThisPage;
+ return $egMapsOpenLayersPrefix . '_' . $mapsOnThisPage;
}
/**
Modified: trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
===================================================================
--- trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
2010-10-01 05:19:19 UTC (rev 74053)
+++ trunk/extensions/Maps/includes/services/YahooMaps/Maps_YahooMaps.php
2010-10-01 05:24:06 UTC (rev 74054)
@@ -108,13 +108,14 @@
* @since 0.6.5
*/
public function getMapId( $increment = true ) {
- global $egMapsYahooMapsPrefix, $egYahooMapsOnThisPage;
+ global $egMapsYahooMapsPrefix;
+ static $mapsOnThisPage = 0;
if ( $increment ) {
- $egYahooMapsOnThisPage++;
+ $mapsOnThisPage++;
}
- return $egMapsYahooMapsPrefix . '_' . $egYahooMapsOnThisPage;
+ return $egMapsYahooMapsPrefix . '_' . $mapsOnThisPage;
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
