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

bug #2796066 [priv] Inconsistent display of databases list

Browse Source
This commit is contained in:
Marc Delisle
2009-06-02 16:53:44 +00:00
parent 06bb14ff47
commit ea466f9180
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -7,6 +7,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
3.2.1.0 (not yet released)
- bug #2799009 Login with ipv6 IP address breaks redirect
- bug #2796066 [priv] Inconsistent display of databases list
3.2.0.0 (not yet released)
- [core] better support for vendor customisation (based on what Debian needs)

18
server_privileges.php
View File

@@ -1859,13 +1859,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
// no database name was given, display select db
if (! empty($found_rows)) {
$pred_db_array = array_diff(
PMA_DBI_fetch_result('SHOW DATABASES;'),
$found_rows);
} else {
$pred_db_array =PMA_DBI_fetch_result('SHOW DATABASES;');
}
$pred_db_array =PMA_DBI_fetch_result('SHOW DATABASES;');
echo ' <label for="text_dbname">' . $GLOBALS['strAddPrivilegesOnDb'] . ':</label>' . "\n";
if (!empty($pred_db_array)) {
@@ -1873,8 +1867,14 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
. ' <option value="" selected="selected">' . $GLOBALS['strUseTextField'] . ':</option>' . "\n";
foreach ($pred_db_array as $current_db) {
$current_db = PMA_escape_mysql_wildcards($current_db);
echo ' <option value="' . htmlspecialchars($current_db) . '">'
. htmlspecialchars($current_db) . '</option>' . "\n";
// cannot use array_diff() once, outside of the loop,
// because the list of databases has special characters
// already escaped in $found_rows,
// contrary to the output of SHOW DATABASES
if (empty($found_rows) || ! in_array($current_db, $found_rows)) {
echo ' <option value="' . htmlspecialchars($current_db) . '">'
. htmlspecialchars($current_db) . '</option>' . "\n";
}
}
echo ' </select>' . "\n";
}