Merge pull request #1318 from mtmail/php-pdo

[nominatim.git] / lib / init-website.php

diff --git a/lib/init-website.php b/lib/init-website.php
index ae2a5d360ae57dd439b29b46507bff99afdc0432..39df4022ce31473c14ba47b08c1c80c00cdb8287 100644 (file)
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -2,7 +2,6 @@
 
 require_once('init.php');
 require_once('ParameterParser.php');
 
 require_once('init.php');
 require_once('ParameterParser.php');

-require_once('DatabaseError.php');

 require_once(CONST_Debug ? 'DebugHtml.php' : 'DebugNone.php');
 
 /***************************************************************************
 require_once(CONST_Debug ? 'DebugHtml.php' : 'DebugNone.php');
 
 /***************************************************************************


@@ -14,9 +13,7 @@ require_once(CONST_Debug ? 'DebugHtml.php' : 'DebugNone.php');
 
 function chksql($oSql, $sMsg = 'Database request failed')
 {
 
 function chksql($oSql, $sMsg = 'Database request failed')
 {

-    if (!PEAR::isError($oSql)) return $oSql;
-
-    throw new Nominatim\DatabaseError($sMsg, 500, null, $oSql);
+    return $oSql;

 }
 
 
 }