From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 7 Jul 2013 14:45:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~594
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/ad1d429de64ac037470f92e0492211a41bd2c613?ds=inline;hp=-c

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

ad1d429de64ac037470f92e0492211a41bd2c613
diff --combined website/reverse.php
index 708aaf78,b4ab97b6..134b5e4e
--- a/website/reverse.php
+++ b/website/reverse.php
@@@ -4,6 -4,18 +4,6 @@@
  	require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
  	require_once(CONST_BasePath.'/lib/log.php');
  
 -	if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
 -	{
 -		$fLoadAvg = getLoadAverage();
 -		if ($fLoadAvg > 2) sleep(60);
 -		if ($fLoadAvg > 4) sleep(120);
 -		if ($fLoadAvg > 6)
 -		{
 -			echo "Bulk User: Temporary block due to high server load\n";
 -			exit;
 -		}
 -	}
 -
  	$oDB =& getDB();
  	ini_set('memory_limit', '200M');
  
@@@ -95,7 -107,7 +95,7 @@@
  			$aPlace = $oDB->getRow($sSQL);
  			if (PEAR::IsError($aPlace))
  			{
- 				failInternalError("Could not determine closest place.", $sSQL, $iPlaceID);
+ 				failInternalError("Could not determine closest place.", $sSQL, $aPlace);
  			}
  			$iPlaceID = $aPlace['place_id'];
  			$iParentPlaceID = $aPlace['parent_place_id'];