| Index: trunk/extensions/Maps/Maps.php |
| — | — | @@ -49,7 +49,8 @@ |
| 50 | 50 | define( 'Maps_GEO_MIN', "'" ); |
| 51 | 51 | define( 'Maps_GEO_SEC', '"' ); |
| 52 | 52 | |
| 53 | | - $useExtensionPath = version_compare( $wgVersion, '1.16', '>=' ) && isset( $wgExtensionAssetsPath ) && $wgExtensionAssetsPath; |
| | 53 | + // TODO |
| | 54 | + $useExtensionPath = /*version_compare( $wgVersion, '1.16', '>=' ) &&*/ isset( $wgExtensionAssetsPath ) && $wgExtensionAssetsPath; |
| 54 | 55 | $egMapsScriptPath = ( $useExtensionPath ? $wgExtensionAssetsPath : $wgScriptPath . '/extensions' ) . '/Maps'; |
| 55 | 56 | $egMapsDir = dirname( __FILE__ ) . '/'; |
| 56 | 57 | unset( $useExtensionPath ); |
| Index: trunk/extensions/Maps/includes/manipulations/Maps_ParamDimension.php |
| — | — | @@ -69,6 +69,10 @@ |
| 70 | 70 | } else if ( $number > $max ) { |
| 71 | 71 | $value = $max; |
| 72 | 72 | } |
| | 73 | + |
| | 74 | + if ( !preg_match( '/(px|ex|em|%)$/', $value ) ) { |
| | 75 | + $value .= 'px'; |
| | 76 | + } |
| 73 | 77 | } |
| 74 | 78 | |
| 75 | 79 | } |
| \ No newline at end of file |
| Index: trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMapsDispMap.php |
| — | — | @@ -1,25 +1,13 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | | - * Class for handling the display_map parser function with Google Maps |
| | 5 | + * Class for handling the display_map parser functions with Google Maps. |
| 6 | 6 | * |
| 7 | 7 | * @file Maps_GoogleMapsDispMap.php |
| 8 | 8 | * @ingroup MapsGoogleMaps |
| 9 | 9 | * |
| 10 | 10 | * @author Jeroen De Dauw |
| 11 | 11 | */ |
| 12 | | - |
| 13 | | -if ( !defined( 'MEDIAWIKI' ) ) { |
| 14 | | - die( 'Not an entry point.' ); |
| 15 | | -} |
| 16 | | - |
| 17 | | -/** |
| 18 | | - * Class for handling the display_map parser functions with Google Maps. |
| 19 | | - * |
| 20 | | - * @ingroup MapsGoogleMaps |
| 21 | | - * |
| 22 | | - * @author Jeroen De Dauw |
| 23 | | - */ |
| 24 | 12 | final class MapsGoogleMapsDispMap extends MapsBaseMap { |
| 25 | 13 | |
| 26 | 14 | protected function initSpecificParamInfo( array &$parameters ) { |