Merge remote-tracking branch 'upstream/master'

diff --combined lib-php/website/search.php
index 72ddebe1e3d32b265775596dc1538d21dad0f612,6b271f0bbc60f695285799a345f1840dbe04372a..56064e7a9efdbdb63e607316155d640852cb1834
--- 1/lib-php/website/search.php
--- 2/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;