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

1 files changed, 9 insertions, 3 deletions

diff --git a/include/common.inc.php b/include/common.inc.php
index 7ef43c281..0da96c7c6 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -104,9 +104,15 @@ include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
 include( PHPWG_ROOT_PATH .'include/template.class.php');
 
 // Database connection
-$pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'],
-			      $conf['db_password'], $conf['db_base']);
-pwg_select_db($conf['db_base'], $pwg_db_link);
+try
+{
+  $pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'],
+                                $conf['db_password'], $conf['db_base']);
+}
+catch (Exception $e)
+{
+  my_error(l10n($e->getMessage(), true); 
+}
 
 pwg_db_check_charset();