| Index: trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3DispPoint.php |
| — | — | @@ -58,8 +58,6 @@ |
| 59 | 59 | * |
| 60 | 60 | */ |
| 61 | 61 | public function addSpecificMapHTML() { |
| 62 | | - global $wgOut; |
| 63 | | - |
| 64 | 62 | $this->output .= Html::element( |
| 65 | 63 | 'div', |
| 66 | 64 | array( |
| Index: trunk/extensions/Maps/GoogleMaps3/Maps_GoogleMaps3DispMap.php |
| — | — | @@ -56,8 +56,6 @@ |
| 57 | 57 | * |
| 58 | 58 | */ |
| 59 | 59 | public function addSpecificMapHTML() { |
| 60 | | - global $wgOut; |
| 61 | | - |
| 62 | 60 | $this->output .= Html::element( |
| 63 | 61 | 'div', |
| 64 | 62 | array( |
| Index: trunk/extensions/Maps/OpenLayers/Maps_OpenLayersDispPoint.php |
| — | — | @@ -53,8 +53,6 @@ |
| 54 | 54 | * |
| 55 | 55 | */ |
| 56 | 56 | public function addSpecificMapHTML( Parser $parser ) { |
| 57 | | - global $wgOut; |
| 58 | | - |
| 59 | 57 | $layerItems = MapsOpenLayers::createLayersStringAndLoadDependencies( $this->output, $this->layers ); |
| 60 | 58 | |
| 61 | 59 | $this->output .= Html::element( |
| Index: trunk/extensions/Maps/OpenLayers/Maps_OpenLayersDispMap.php |
| — | — | @@ -46,8 +46,6 @@ |
| 47 | 47 | * |
| 48 | 48 | */ |
| 49 | 49 | public function addSpecificMapHTML( Parser $parser ) { |
| 50 | | - global $wgOut; |
| 51 | | - |
| 52 | 50 | $layerItems = MapsOpenLayers::createLayersStringAndLoadDependencies( $this->output, $this->layers ); |
| 53 | 51 | |
| 54 | 52 | $this->output .= Html::element( |
| Index: trunk/extensions/Maps/Maps.php |
| — | — | @@ -33,13 +33,13 @@ |
| 34 | 34 | echo '<b>Warning:</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>.'; |
| 35 | 35 | } |
| 36 | 36 | else { |
| 37 | | - define( 'Maps_VERSION', '0.6 a4' ); |
| | 37 | + define( 'Maps_VERSION', '0.6 a5' ); |
| 38 | 38 | |
| 39 | 39 | // The different coordinate notations. |
| 40 | | - define( 'Maps_COORDS_FLOAT', 0 ); |
| 41 | | - define( 'Maps_COORDS_DMS', 1 ); |
| 42 | | - define( 'Maps_COORDS_DM', 2 ); |
| 43 | | - define( 'Maps_COORDS_DD', 3 ); |
| | 40 | + define( 'Maps_COORDS_FLOAT', 'float' ); |
| | 41 | + define( 'Maps_COORDS_DMS', 'dms' ); |
| | 42 | + define( 'Maps_COORDS_DM', 'dm' ); |
| | 43 | + define( 'Maps_COORDS_DD', 'dd' ); |
| 44 | 44 | |
| 45 | 45 | // The symbols to use for degrees, minutes and seconds. |
| 46 | 46 | define( 'Maps_GEO_DEG', "°" ); |
| Index: trunk/extensions/Maps/OpenStreetMap/Maps_OSMDispMap.php |
| — | — | @@ -67,8 +67,6 @@ |
| 68 | 68 | * |
| 69 | 69 | */ |
| 70 | 70 | public function addSpecificMapHTML( Parser $parser ) { |
| 71 | | - global $wgOut; |
| 72 | | - |
| 73 | 71 | $parser->getOutput()->addHeadItem( |
| 74 | 72 | Html::inlineScript( <<<EOT |
| 75 | 73 | addOnloadHook( |
| Index: trunk/extensions/Maps/OpenStreetMap/Maps_OSMDispPoint.php |
| — | — | @@ -53,8 +53,6 @@ |
| 54 | 54 | * |
| 55 | 55 | */ |
| 56 | 56 | public function addSpecificMapHTML( Parser $parser ) { |
| 57 | | - global $wgOut; |
| 58 | | - |
| 59 | 57 | $parser->getOutput()->addHeadItem( |
| 60 | 58 | Html::inlineScript( <<<EOT |
| 61 | 59 | addOnloadHook( |
| Index: trunk/extensions/Maps/GoogleMaps/Maps_GoogleMapsDispMap.php |
| — | — | @@ -63,8 +63,6 @@ |
| 64 | 64 | * |
| 65 | 65 | */ |
| 66 | 66 | public function addSpecificMapHTML( Parser $parser ) { |
| 67 | | - global $wgOut; |
| 68 | | - |
| 69 | 67 | MapsGoogleMaps::addOverlayOutput( $this->output, $this->mapName, $this->overlays, $this->controls ); |
| 70 | 68 | |
| 71 | 69 | $this->output .= Html::element( |
| Index: trunk/extensions/Maps/GoogleMaps/Maps_GoogleMapsDispPoint.php |
| — | — | @@ -65,8 +65,6 @@ |
| 66 | 66 | * |
| 67 | 67 | */ |
| 68 | 68 | public function addSpecificMapHTML( Parser $parser ) { |
| 69 | | - global $wgOut; |
| 70 | | - |
| 71 | 69 | MapsGoogleMaps::addOverlayOutput( $this->output, $this->mapName, $this->overlays, $this->controls ); |
| 72 | 70 | |
| 73 | 71 | $this->output .= Html::element( |
| Index: trunk/extensions/Maps/YahooMaps/Maps_YahooMapsDispPoint.php |
| — | — | @@ -53,8 +53,6 @@ |
| 54 | 54 | * |
| 55 | 55 | */ |
| 56 | 56 | public function addSpecificMapHTML( Parser $parser ) { |
| 57 | | - global $wgOut; |
| 58 | | - |
| 59 | 57 | $this->output .= Html::element( |
| 60 | 58 | 'div', |
| 61 | 59 | array( |
| Index: trunk/extensions/Maps/YahooMaps/Maps_YahooMapsDispMap.php |
| — | — | @@ -46,8 +46,6 @@ |
| 47 | 47 | * |
| 48 | 48 | */ |
| 49 | 49 | public function addSpecificMapHTML( Parser $parser ) { |
| 50 | | - global $wgOut; |
| 51 | | - |
| 52 | 50 | $this->output .= Html::element( |
| 53 | 51 | 'div', |
| 54 | 52 | array( |