From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 11 Aug 2015 21:19:51 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~438
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/fa0cf215e723401fec62a3b336a4ed8908c2bfed

Merge remote-tracking branch 'upstream/master'

Conflicts:
	website/reverse.php
	website/search.php
---

fa0cf215e723401fec62a3b336a4ed8908c2bfed
diff --cc website/reverse.php
index d70a11e9,abc33a09..ee2fa475
--- a/website/reverse.php
+++ b/website/reverse.php
@@@ -50,8 -69,11 +57,12 @@@
  		$aPlace = null;
  	}
  
 +	logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
  
- 	if (CONST_Debug) exit;
+ 	if (CONST_Debug)
+ 	{
+ 		var_dump($aPlace);
+ 		exit;
+ 	}
  
  	include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');