diff options
author | nikrou <nikrou@piwigo.org> | 2010-03-21 22:51:36 +0000 |
---|---|---|
committer | nikrou <nikrou@piwigo.org> | 2010-03-21 22:51:36 +0000 |
commit | 4773d7a35052df4683b0445c08feae609764bfb0 (patch) | |
tree | 98a5e8345ad4698acd71b55040fd99e64f388fd2 /include/dblayer/functions_pgsql.inc.php | |
parent | 4158d3296072973d094cd295cc18f0035b5d7000 (diff) |
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
Diffstat (limited to '')
-rw-r--r-- | include/dblayer/functions_pgsql.inc.php | 14 |
1 files changed, 10 insertions, 4 deletions
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) |