Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index 872d9801761a58664fa25b7221a47ceb9aa2f677..cd522c5771c0fdd536b097d59aeec4b445881e22 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -20,10 +20,12 @@
        $aLangPrefOrder = getPreferredLanguages();
        $oGeocode->setLanguagePreference($aLangPrefOrder);
 
        $aLangPrefOrder = getPreferredLanguages();
        $oGeocode->setLanguagePreference($aLangPrefOrder);
 

+    /*

        if (isset($aLangPrefOrder['name:de'])) $oGeocode->setReverseInPlan(true);
        if (isset($aLangPrefOrder['name:ru'])) $oGeocode->setReverseInPlan(true);
        if (isset($aLangPrefOrder['name:ja'])) $oGeocode->setReverseInPlan(true);
        if (isset($aLangPrefOrder['name:pl'])) $oGeocode->setReverseInPlan(true);
        if (isset($aLangPrefOrder['name:de'])) $oGeocode->setReverseInPlan(true);
        if (isset($aLangPrefOrder['name:ru'])) $oGeocode->setReverseInPlan(true);
        if (isset($aLangPrefOrder['name:ja'])) $oGeocode->setReverseInPlan(true);
        if (isset($aLangPrefOrder['name:pl'])) $oGeocode->setReverseInPlan(true);

+    */

 
        // Format for output
        $sOutputFormat = 'html';
 
        // Format for output
        $sOutputFormat = 'html';


@@ -87,7 +89,7 @@
        } else {
         if (!(isset($_GET['q']) && $_GET['q']) && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
         {
        } else {
         if (!(isset($_GET['q']) && $_GET['q']) && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
         {

-            $sQuery = substr($_SERVER['PATH_INFO'], 1);
+            $sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);

 
             // reverse order of '/' separated string
             $aPhrases = explode('/', $sQuery);
 
             // reverse order of '/' separated string
             $aPhrases = explode('/', $sQuery);