From 4773d7a35052df4683b0445c08feae609764bfb0 Mon Sep 17 00:00:00 2001
From: nikrou <nikrou@piwigo.org>
Date: Sun, 21 Mar 2010 22:51:36 +0000
Subject: Feature 1255 : only one function use exceptions to deal with
 differents possible errors

git-svn-id: http://piwigo.org/svn/trunk@5236 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/dblayer/functions_pgsql.inc.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'include/dblayer/functions_pgsql.inc.php')

diff --git a/include/dblayer/functions_pgsql.inc.php b/include/dblayer/functions_pgsql.inc.php
index fe350d090..5c928c53c 100644
--- a/include/dblayer/functions_pgsql.inc.php
+++ b/include/dblayer/functions_pgsql.inc.php
@@ -33,7 +33,7 @@ define('DB_RANDOM_FUNCTION', 'RANDOM');
  *
  */
 
-function pwg_db_connect($host, $user, $password, $database, $die=true)
+function pwg_db_connect($host, $user, $password, $database)
 {
   $connection_string = '';
   if (strpos($host,':') !== false) 
@@ -49,9 +49,15 @@ function pwg_db_connect($host, $user, $password, $database, $die=true)
 				$user, 
 				$password,
 				$database);
-  $link = pg_connect($connection_string) or my_error('pg_connect', $die);  
-
-  return $link;
+  $link = pg_connect($connection_string);
+  if (!$link)
+  {
+    throw new Exception("Can't connect to server");
+  }
+  else
+  {
+    return $link;
+  }
 }
 
 function pwg_select_db($database=null, $link=null, $die=null)
-- 
cgit v1.2.3