From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 15 Oct 2014 22:35:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~508
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/79b30a8c0f695746b3ed79e4fb484accd5bf9bec?hp=-c

Merge remote-tracking branch 'upstream/master'
---

79b30a8c0f695746b3ed79e4fb484accd5bf9bec
diff --combined website/search.php
index a3a926fd,a9e20d4e..cd522c57
--- a/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);