http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90205
Revision: 90205
Author: jeroendedauw
Date: 2011-06-16 14:54:11 +0000 (Thu, 16 Jun 2011)
Log Message:
-----------
fix bug 29421 and increment version nr
Modified Paths:
--------------
branches/Maps0.7.x/INSTALL
branches/Maps0.7.x/Maps.php
branches/Maps0.7.x/RELEASE-NOTES
branches/Maps0.7.x/includes/Maps_CoordinateParser.php
Modified: branches/Maps0.7.x/INSTALL
===================================================================
--- branches/Maps0.7.x/INSTALL 2011-06-16 14:53:43 UTC (rev 90204)
+++ branches/Maps0.7.x/INSTALL 2011-06-16 14:54:11 UTC (rev 90205)
@@ -1,4 +1,4 @@
-[[Maps 0.7.7]]
+[[Maps 0.7.8]]
In order to use this version of Maps, you need to have Validator 0.3.6
installed. If you get a distribution
from this page, you don't need to bother this, since Validator comes bundled
with every release, and will
Modified: branches/Maps0.7.x/Maps.php
===================================================================
--- branches/Maps0.7.x/Maps.php 2011-06-16 14:53:43 UTC (rev 90204)
+++ branches/Maps0.7.x/Maps.php 2011-06-16 14:54:11 UTC (rev 90205)
@@ -36,7 +36,7 @@
die( '<b>Error:</b> You need to have <a
href="http://www.mediawiki.org/wiki/Extension:Validator";>Validator</a>
installed in order to use <a
href="http://www.mediawiki.org/wiki/Extension:Maps";>Maps</a>.<br />' );
}
-define( 'Maps_VERSION', '0.7.7' );
+define( 'Maps_VERSION', '0.7.8 alpha' );
$wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,
Modified: branches/Maps0.7.x/RELEASE-NOTES
===================================================================
--- branches/Maps0.7.x/RELEASE-NOTES 2011-06-16 14:53:43 UTC (rev 90204)
+++ branches/Maps0.7.x/RELEASE-NOTES 2011-06-16 14:54:11 UTC (rev 90205)
@@ -7,6 +7,11 @@
http://mapping.referata.com/wiki/Maps/Version_history#Maps_change_log
+=== Maps 0.7.8 ===
+(201x-xx-xx)
+
+* Fixed coordinate normalization issue (bug 29421).
+
=== Maps 0.7.7 ===
(2011-06-15)
Modified: branches/Maps0.7.x/includes/Maps_CoordinateParser.php
===================================================================
--- branches/Maps0.7.x/includes/Maps_CoordinateParser.php 2011-06-16
14:53:43 UTC (rev 90204)
+++ branches/Maps0.7.x/includes/Maps_CoordinateParser.php 2011-06-16
14:54:11 UTC (rev 90205)
@@ -68,8 +68,11 @@
// Handle i18n notations.
$coordinates = self::handleI18nLabels( $coordinates );
+ // Normalize the coordinates string.
+ $coordinates = self::normalizeCoordinates( $coordinates );
+
// Determine what notation the coordinates are in.
- $coordsType = self::getCoordinatesType( $coordinates );
+ $coordsType = self::getCoordinatesType( $coordinates, false );
// If getCoordinatesType returned false, the provided value is
invalid or in an unsuported notation.
if ( $coordsType === false ) {
@@ -110,12 +113,15 @@
* @since 0.6
*
* @param string $coordinates
+ * @param boolean $normalize
*
* @return Integer or false
*/
- public static function getCoordinatesType( $coordinates ) {
- // Normalize the coordinates string.
- $coordinates = self::normalizeCoordinates( $coordinates );
+ public static function getCoordinatesType( $coordinates, $normalize =
true ) {
+ if ( $normalize ) {
+ // Normalize the coordinates string.
+ $coordinates = self::normalizeCoordinates( $coordinates
);
+ }
switch ( true ) {
case self::areFloatCoordinates( $coordinates ):
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
