]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Thu, 26 Apr 2018 20:29:54 +0000 (22:29 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Thu, 26 Apr 2018 20:29:54 +0000 (22:29 +0200)
1  2 
sql/functions.sql
website/reverse.php

Simple merge
index 822081ef7d4caff8973550e909400db78865d599,3bcac2ce40b2a99c412d6dd027e9c7f0af7bd09d..0251c8c8206d122f24ca0867f1135f2efca61ee8
@@@ -62,10 -62,9 +62,10 @@@ if (isset($aPlace)) 
          $aPlace = array_merge($aPlace, $aOutlineResult);
      }
  } else {
-     $aPlace = [];
+     $aPlace = array();
  }
  
 +logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
  
  if (CONST_Debug) {
      var_dump($aPlace);