patch #1455286, catch 'permission denied' error on SHOW DATABASES

This commit is contained in:
Marc Delisle
2006-03-23 10:59:50 +00:00
parent ff30327b2c
commit 01b1374bc4
2 changed files with 11 additions and 6 deletions

View File

@@ -7,6 +7,8 @@ $Source$
2006-03-23 Marc Delisle <lem9@users.sourceforge.net>
* libraries/display_tbl.lib.php: bug #1444417 blobs are centered
* libraries/common.lib.php: patch #1455286, catch 'permission denied'
error on SHOW DATABASES, thanks to Bernard Dautrevaux - b-dautrevaux
2006-03-22 Alexander M. Turek <me@derrabus.de>
* lang/spanish-*.inc.php: Updates, thanks to Daniel Hinostroza.

View File

@@ -3137,13 +3137,16 @@ if (!defined('PMA_MINIMUM_COMMON')) {
$local_query = 'SHOW DATABASES LIKE \'' . $dblist[$i] . '\'';
// here, a PMA_DBI_query() could fail silently
// if SHOW DATABASES is disabled
$rs = PMA_DBI_try_query($local_query, $controllink);
$rs = PMA_DBI_try_query($local_query, $controllink);
if ($i == 0
&& (substr(PMA_DBI_getError($controllink), 1, 4) == 1045)) {
// "SHOW DATABASES" statement is disabled
$true_dblist[] = str_replace('\\_', '_', str_replace('\\%', '%', $dblist[$i]));
$is_show_dbs = false;
if ($i == 0 && ! $rs) {
$error_code = substr(PMA_DBI_getError($controllink), 1, 4);
if ($error_code == 1227 || $error_code == 1045) {
// "SHOW DATABASES" statement is disabled or not allowed to user
$true_dblist[] = str_replace('\\_', '_', str_replace('\\%', '%', $dblist[$i]));
$is_show_dbs = false;
}
unset($error_code);
}
// Debug
// elseif (PMA_DBI_getError($controllink)) {