nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

undefined variable cfg nopassword in mysqli

Browse Source
This commit is contained in:
Marc Delisle
2006-03-17 14:29:29 +00:00
parent a2f7bc01de
commit 2af02bc0a0
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2006-03-17 Marc Delisle <lem9@users.sourceforge.net>
* libraries/dbi/mysqli.dbi.lib.php: if $cfg['Servers'][$i]['nopassword']
is not defined (using an older config.inc.php), an error is displayed
when login fails
2006-03-17 Michal Čihař <michal@cihar.com> 2006-03-17 Michal Čihař <michal@cihar.com>
* scripts/setup.php: Allow empty socket (bug #1452142). * scripts/setup.php: Allow empty socket (bug #1452142).

2
libraries/dbi/mysqli.dbi.lib.php
View File

@@ -92,7 +92,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false)
$return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags);
// Retry with empty password if we're allowed to // Retry with empty password if we're allowed to
if ($return_value == false && $cfg['Server']['nopassword'] && !$is_controluser) { if ($return_value == false && isset($cfg['Server']['nopassword']) && $cfg['Server']['nopassword'] && !$is_controluser) {
$return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags); $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags);
} }