http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73735
Revision: 73735
Author: jeroendedauw
Date: 2010-09-25 08:22:30 +0000 (Sat, 25 Sep 2010)
Log Message:
-----------
Changes for 0.7 - follow up to r73733
Modified Paths:
--------------
trunk/extensions/Maps/includes/features/Maps_BaseMap.php
trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
Modified: trunk/extensions/Maps/includes/features/Maps_BaseMap.php
===================================================================
--- trunk/extensions/Maps/includes/features/Maps_BaseMap.php 2010-09-25
08:06:19 UTC (rev 73734)
+++ trunk/extensions/Maps/includes/features/Maps_BaseMap.php 2010-09-25
08:22:30 UTC (rev 73735)
@@ -114,20 +114,10 @@
$this->centreLon = Xml::escapeJsString(
$this->coordinates['lon'] );
}
else { // If it's false, the coordinate was invalid, or
geocoding failed. Either way, the default's should be used.
- // TODO: Some warning this failed would be nice
here.
- $this->setDefaultCentre();
+ global $egMapsDefaultMapCentre;
+ $this->setCentre( $egMapsDefaultMapCentre );
}
}
}
- /**
- * Sets the centre lat and lon to their default.
- */
- private function setDefaultCentre() {
- global $egMapsMapLat, $egMapsMapLon;
-
- $this->centreLat = $egMapsMapLat;
- $this->centreLon = $egMapsMapLon;
- }
-
}
\ No newline at end of file
Modified: trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
===================================================================
--- trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
2010-09-25 08:06:19 UTC (rev 73734)
+++ trunk/extensions/Maps/includes/features/Maps_BasePointMap.php
2010-09-25 08:22:30 UTC (rev 73735)
@@ -180,7 +180,8 @@
}
else {
// If centre is not set and there are no
markers, use the default latitude and longitutde.
- $this->setCentreDefaults();
+ global $egMapsDefaultMapCentre;
+ // TODO
}
}
else { // If a centre value is set, geocode when needed and use
it.
@@ -192,18 +193,10 @@
$this->centreLon = Xml::escapeJsString(
$this->centre['lon'] );
}
else { // If it's false, the coordinate was invalid, or
geocoding failed. Either way, the default's should be used.
- $this->setCentreDefaults();
+ global $egMapsDefaultMapCentre;
+ // TODO
}
}
}
- /**
- * Sets the centre latitude and longitutde to the defaults.
- */
- private function setCentreDefaults() {
- global $egMapsMapLat, $egMapsMapLon;
- $this->centreLat = $egMapsMapLat;
- $this->centreLon = $egMapsMapLon;
- }
-
}
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
