From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 24 May 2021 15:54:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~166
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b50d6078f5cec2362813d710db35e616e9913ea2?hp=-c

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

b50d6078f5cec2362813d710db35e616e9913ea2
diff --combined lib-php/website/search.php
index 72ddebe1,6b271f0b..56064e7a
--- a/lib-php/website/search.php
+++ b/lib-php/website/search.php
@@@ -54,12 -54,7 +54,12 @@@ if (!$oGeocode->getQueryString(
  
  $hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder);
  
 -$aSearchResults = $oGeocode->lookup();
 +// Ignore requests from a faulty app.
 +if ($oGeocode->getQueryString() === '-1,-1') {
 +  $aSearchResults = array();
 +} else {
 +  $aSearchResults = $oGeocode->lookup();
 +}
  
  logEnd($oDB, $hLog, count($aSearchResults));
  
@@@ -79,7 -74,7 +79,7 @@@ if (isset($_SERVER['REQUEST_SCHEME']
                  .$_SERVER['HTTP_HOST'].$_SERVER['DOCUMENT_URI'].'/?'
                  .http_build_query($aMoreParams);
  } else {
-     $sMoreURL = '/search.php'.http_build_query($aMoreParams);
+     $sMoreURL = '/search.php?'.http_build_query($aMoreParams);
  }
  
  if (CONST_Debug) exit;