diff options
| author | mistic100 <mistic@piwigo.org> | 2013-02-12 11:06:00 +0000 |
|---|---|---|
| committer | mistic100 <mistic@piwigo.org> | 2013-02-12 11:06:00 +0000 |
| commit | e8bdcecfeb97a8f12d7c1de06f77067a4dd307e1 (patch) | |
| tree | 81e149470c32b435d2c49ebd0774fe1a822a694a /admin | |
| parent | 758f29eb7d5372421b09e484cdbcd01d561b923c (diff) | |
feature:65 pwg_db_connect doesn't return anything now
git-svn-id: http://piwigo.org/svn/trunk@20720 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | admin/include/functions_install.inc.php | 10 | ||||
| -rw-r--r-- | admin/include/functions_upgrade.php | 8 |
2 files changed, 6 insertions, 12 deletions
diff --git a/admin/include/functions_install.inc.php b/admin/include/functions_install.inc.php index 335dd0393..94e011cde 100644 --- a/admin/include/functions_install.inc.php +++ b/admin/include/functions_install.inc.php @@ -143,15 +143,11 @@ function activate_core_themes() function install_db_connect(&$infos, &$errors) { - global $pwg_db_link; - try { - $pwg_db_link = pwg_db_connect($_POST['dbhost'], $_POST['dbuser'], $_POST['dbpasswd'], $_POST['dbname']); - if ($pwg_db_link) - { - pwg_db_check_version(); - } + pwg_db_connect($_POST['dbhost'], $_POST['dbuser'], + $_POST['dbpasswd'], $_POST['dbname']); + pwg_db_check_version(); } catch (Exception $e) { diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php index 349efa205..ed4b0f410 100644 --- a/admin/include/functions_upgrade.php +++ b/admin/include/functions_upgrade.php @@ -314,11 +314,9 @@ function upgrade_db_connect() try { - $pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'], $conf['db_password'], $conf['db_base']); - if ($pwg_db_link) - { - pwg_db_check_version(); - } + pwg_db_connect($conf['db_host'], $conf['db_user'], + $conf['db_password'], $conf['db_base']); + pwg_db_check_version(); } catch (Exception $e) { |