Merge remote-tracking branch 'upstream/master'

diff --combined website/search.php
index a3a926fd951f440c343857884bed77937b0bb6e5,a9e20d4eb47e564fa4889b42312869ecd8b3462e..cd522c5771c0fdd536b097d59aeec4b445881e22
--- 1/website/search.php
--- 2/website/search.php
+++ b/website/search.php
@@@ -20,12 -20,10 +20,12 @@@
        $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);
 +    */
  
        // Format for output
        $sOutputFormat = 'html';
@@@ -89,7 -87,7 +89,7 @@@
        } 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);