From 4773d7a35052df4683b0445c08feae609764bfb0 Mon Sep 17 00:00:00 2001 From: nikrou 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 --- upgrade.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'upgrade.php') diff --git a/upgrade.php b/upgrade.php index 4e01b9272..278f75da4 100644 --- a/upgrade.php +++ b/upgrade.php @@ -51,9 +51,15 @@ include_once(PHPWG_ROOT_PATH.'include/constants.php'); define('PREFIX_TABLE', $prefixeTable); // 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(); -- cgit v1.2.3