| Index: trunk/extensions/Maps/Maps.php |
| — | — | @@ -56,7 +56,7 @@ |
| 57 | 57 | */ |
| 58 | 58 | function efMapsSetup() { |
| 59 | 59 | global $wgExtensionCredits, $wgOut; |
| 60 | | - global $egMapsDefaultService, $egMapsAvailableServices, $egMapsServices, $egMapsMainServices, $egMapsScriptPath, $egMapsDefaultGeoService, $egMapsAvailableGeoServices; |
| | 60 | + global $egMapsDefaultService, $egMapsAvailableServices, $egMapsServices, $egMapsScriptPath, $egMapsDefaultGeoService, $egMapsAvailableGeoServices; |
| 61 | 61 | |
| 62 | 62 | efMapsValidateGoogleMapsKey(); |
| 63 | 63 | |
| — | — | @@ -64,9 +64,7 @@ |
| 65 | 65 | $egMapsDefaultService = in_array($egMapsDefaultService, $egMapsAvailableServices) ? $egMapsDefaultService : $egMapsAvailableServices[0]; |
| 66 | 66 | $egMapsDefaultGeoService = in_array($egMapsDefaultGeoService, $egMapsAvailableGeoServices) ? $egMapsDefaultGeoService : $egMapsAvailableGeoServices[0]; |
| 67 | 67 | |
| 68 | | - $egMapsMainServices = array_keys($egMapsServices); |
| 69 | | - |
| 70 | | - $services_list = implode(', ', $egMapsMainServices); |
| | 68 | + $services_list = implode(', ', array_keys($egMapsServices)); |
| 71 | 69 | |
| 72 | 70 | wfLoadExtensionMessages( 'Maps' ); |
| 73 | 71 | |