HTML map: new button -show map bounds- in top right corner

[nominatim.git] / lib / db.php

diff --git a/lib/db.php b/lib/db.php
index cc84bf9bdaf71df7261aa393721e25c567771336..822acc37d4997f64bca66bc7ea506dcb3ab0f9e3 100644 (file)
--- 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'");