| Index: trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMaps.php |
| — | — | @@ -164,7 +164,7 @@ |
| 165 | 165 | * |
| 166 | 166 | * @return boolean |
| 167 | 167 | */ |
| 168 | | - public static function isGOverlay( $value ) { |
| | 168 | + public static function isGOverlay( $value, array $metaData ) { |
| 169 | 169 | $value = explode( '-', $value ); |
| 170 | 170 | return in_array( $value[0], self::getOverlayNames() ); |
| 171 | 171 | } |
| Index: trunk/extensions/Maps/Maps_Mapper.php |
| — | — | @@ -25,7 +25,7 @@ |
| 26 | 26 | Validator::addOutputFormat( 'coordinateSets', array( __CLASS__, 'formatLocations' ) ); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | | - public static function isLocation( $location ) { |
| | 29 | + public static function isLocation( $location, array $metaData ) { |
| 30 | 30 | if ( self::geocoderIsAvailable() ) { |
| 31 | 31 | return MapsGeocoder::isLocation( $location ); |
| 32 | 32 | } else { |
| — | — | @@ -33,10 +33,10 @@ |
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | | - public static function areLocations( $locations ) { |
| | 37 | + public static function areLocations( $locations, array $metaData ) { |
| 38 | 38 | $locations = (array)$locations; |
| 39 | 39 | foreach ( $locations as $location ) { |
| 40 | | - if ( !self::isLocation( $location ) ) { |
| | 40 | + if ( !self::isLocation( $location, $metaData ) ) { |
| 41 | 41 | return false; |
| 42 | 42 | } |
| 43 | 43 | } |
| — | — | @@ -127,7 +127,7 @@ |
| 128 | 128 | * |
| 129 | 129 | * @return boolean |
| 130 | 130 | */ |
| 131 | | - public static function isMapDimension( &$value, $dimension, $correct = false, $default = 0 ) { |
| | 131 | + public static function isMapDimension( &$value, array $metaData, $dimension, $correct = false, $default = 0 ) { |
| 132 | 132 | global $egMapsSizeRestrictions; |
| 133 | 133 | |
| 134 | 134 | // See if the notation is valid. |
| — | — | @@ -188,7 +188,7 @@ |
| 189 | 189 | * @param number $default The default value for this dimension. |
| 190 | 190 | */ |
| 191 | 191 | public static function setMapDimension( &$value, $dimension, $default ) { |
| 192 | | - self::isMapDimension( $value, $dimension, true, $default ); |
| | 192 | + self::isMapDimension( $value, array(), $dimension, true, $default ); |
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | /** |