[SPIP][PLUGINS] v3.0-->v3.2

[lhc/web/www.git] / www / plugins / gis / action / gis_geocoder_rechercher.php

diff --git a/www/plugins/gis/action/gis_geocoder_rechercher.php b/www/plugins/gis/action/gis_geocoder_rechercher.php
index 3e7f757..feaebc4 100644 (file)
--- a/www/plugins/gis/action/gis_geocoder_rechercher.php
+++ b/www/plugins/gis/action/gis_geocoder_rechercher.php
@@ -23,7 +23,7 @@ function action_gis_geocoder_rechercher_dist() {
        }
 
        /* On filtre les arguments à renvoyer à Nomatim (liste blanche) */
-       $arguments = collecter_requests(array('json_callback', 'format', 'q', 'limit', 'addressdetails', 'accept-language', 'lat', 'lon'), array());
+       $arguments = collecter_requests(array('format', 'q', 'limit', 'addressdetails', 'accept-language', 'lat', 'lon'), array());
 
        $geocoder = defined('_GIS_GEOCODER') ? _GIS_GEOCODER : 'photon';
 
@@ -31,7 +31,8 @@ function action_gis_geocoder_rechercher_dist() {
                header('Content-Type: application/json; charset=UTF-8');
                if ($geocoder == 'photon') {
                        if (isset($arguments['accept-language'])) {
-                               $arguments['lang'] = $arguments['accept-language'];
+                               // ne garder que les deux premiers caractères du code de langue, car les variantes spipiennes comme fr_fem posent problème
+                               $arguments['lang'] = substr($arguments['accept-language'], 0, 2);
                                unset($arguments['accept-language']);
                        }
                        if ($mode == 'search') {