From 041a81a8e1f3a9dcdb9aa93ccc28b3ae56f81c74 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 16 Sep 2001 00:32:52 +0000 Subject: [PATCH] bug 460475 --- ChangeLog | 4 ++++ libraries/common.lib.php3 | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2ad1d13d7..f12437a41 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2001-09-15 Marc Delisle + * libraries/common.lib.php3, bug #460475: user can be blank in + mysql.db (anonymous user), as stated in MySQL doc. + 2001-09-15 Loïc Chapeaux * tbl_change.php3, lines 351-352: fixed bug #461623 (wrong maxlength in table_change.php). diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 72c5f2218..ac9d45370 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -401,7 +401,9 @@ if (!defined('__LIB_COMMON__')){ // This maintenance is to fix code to work correctly for // regular expressions. if ($row['Select_priv'] != 'Y') { - $local_query = 'SELECT DISTINCT Db FROM mysql.db WHERE Select_priv = \'Y\' AND User = \'' . $PHP_AUTH_USER . '\''; +// User can be blank (anonymous user) + $local_query = 'SELECT DISTINCT Db FROM mysql.db WHERE Select_priv = \'Y\' AND (User = \'' . $PHP_AUTH_USER . '\' + OR User = \'\') '; $rs = mysql_query($local_query) or mysql_die('', $local_query, FALSE, FALSE); if (@mysql_numrows($rs) <= 0) { $local_query = 'SELECT DISTINCT Db FROM mysql.tables_priv WHERE Table_priv LIKE \'%Select%\' AND User = \'' . $PHP_AUTH_USER . '\'';