From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 17 Dec 2016 17:40:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~409
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/08f4279b6efd03f83860c90e931625aa435b271e?hp=--cc

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

08f4279b6efd03f83860c90e931625aa435b271e
diff --cc website/reverse.php
index 56b80a5c,026fa85b..00bcf635
--- a/website/reverse.php
+++ b/website/reverse.php
@@@ -86,9 -87,10 +87,11 @@@ if (isset($aPlace)) 
      if ($aOutlineResult) {
          $aPlace = array_merge($aPlace, $aOutlineResult);
      }
+ } else {
+     $aPlace = [];
  }
  
 +logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
  
  if (CONST_Debug) {
      var_dump($aPlace);