From b0e1de3732fbd0da9a594bbe540055488a3a5804 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 28 Jan 2005 20:20:45 +0000 Subject: [PATCH] bug 1111706 undefined function PMA_reloadNavigation --- ChangeLog | 5 +++++ libraries/dbi/mysqli.dbi.lib.php | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e869b26e2..111b565b7 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ phpMyAdmin - Changelog $Id$ $Source$ +2005-01-28 Marc Delisle + * libraries/dbi/mysqli.dbi.lib.php: bug #1111706, call to undefined + function PMA_reloadNavigation(). A failed connection was not properly + detected + 2005-01-27 Marc Delisle * libraries/fpdf/fpdf.php: bug #1106146, missing header for PDF, thanks to Michal diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 5e1f3fe19..6595517e9 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -68,9 +68,9 @@ function PMA_DBI_connect($user, $password) { $client_flags = $cfg['Server']['compress'] && defined('MYSQLI_CLIENT_COMPRESS') ? MYSQLI_CLIENT_COMPRESS : 0; - @mysqli_real_connect($link, $cfg['Server']['host'], $user, $password, FALSE, $server_port, $server_socket, $client_flags); + $return_value = @mysqli_real_connect($link, $cfg['Server']['host'], $user, $password, FALSE, $server_port, $server_socket, $client_flags); - if (empty($link)) { + if ($return_value == FALSE) { PMA_auth_fails(); } // end if