Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-php / website / search.php

diff --git a/lib-php/website/search.php b/lib-php/website/search.php
index ae3e1dbff2d9288556bcf9e3dd6be85cbae55552..e553ef39a3a5616419169e89e5a9085d8c947252 100644 (file)
--- a/lib-php/website/search.php
+++ b/lib-php/website/search.php
@@ -54,7 +54,12 @@ if (!$oGeocode->getQueryString()
 
 $hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder);
 
 
 $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));
 
 
 logEnd($oDB, $hLog, count($aSearchResults));
 


@@ -74,10 +79,12 @@ if (isset($_SERVER['REQUEST_SCHEME'])
                 .$_SERVER['HTTP_HOST'].$_SERVER['DOCUMENT_URI'].'/?'
                 .http_build_query($aMoreParams);
 } else {
                 .$_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;
+if (CONST_Debug) {
+    exit;
+}

 
 $sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat;
 include(CONST_LibDir.'/template/search-'.$sOutputTemplate.'.php');
 
 $sOutputTemplate = ($sOutputFormat == 'jsonv2') ? 'json' : $sOutputFormat;
 include(CONST_LibDir.'/template/search-'.$sOutputTemplate.'.php');