Merge remote-tracking branch 'upstream/master'

diff --combined website/reverse.php
index 708aaf789ead889bd07a9fc6126ca15728d7026e,b4ab97b6cd4eac9c2f929d8be922ce2f0009075d..134b5e4e84d76cdb8ba6d12243b62993d6e71027
--- 1/website/reverse.php
--- 2/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'];