From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 6 Apr 2018 19:19:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~339
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/1e902ef60797be97f8b95cc716af01789e8be14c?hp=-c

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

1e902ef60797be97f8b95cc716af01789e8be14c
diff --combined lib/Geocode.php
index 017d7ad9,612c1a0f..1c84f14b
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -19,7 -19,7 +19,7 @@@ class Geocod
      protected $bIncludeAddressDetails = false;
  
      protected $aExcludePlaceIDs = array();
 -    protected $bReverseInPlan = false;
 +    protected $bReverseInPlan = true;
  
      protected $iLimit = 20;
      protected $iFinalLimit = 10;
@@@ -620,7 -620,7 +620,7 @@@
              }
  
              Debug::printDebugArray('Search context', $oCtx);
-             Debug::printDebugArray('Base search', $aSearches[0]);
+             Debug::printDebugArray('Base search', empty($aSearches) ? null : $aSearches[0]);
              Debug::printVar('Final query phrases', $aInPhrases);
  
              // Convert each phrase to standard form