X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/7a50d2f9964421e932313b15f5d7d3b05ded4c45..95961d098da553a335c9c44dc6a9827b83e7fc99:/lib/db.php

diff --git a/lib/db.php b/lib/db.php
index cc84bf9b..822acc37 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -4,13 +4,8 @@
 	function &getDB($bNew = false, $bPersistent = false)
 	{
 		// Get the database object
-		$oDB = DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent);
-		if (PEAR::IsError($oDB))
-		{
-			var_dump(CONST_Database_DSN);
-			var_Dump($oDB);
-			fail($oDB->getMessage());
-		}
+		$oDB = chksql(DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent),
+		              "Failed to establish database connection");
 		$oDB->setFetchMode(DB_FETCHMODE_ASSOC);
 		$oDB->query("SET DateStyle TO 'sql,european'");
 		$oDB->query("SET client_encoding TO 'utf-8'");