bug #3559925 [privileges] Incorrect updating of the list of users

This commit is contained in:
J.M 2012-08-22 11:14:45 +02:00
parent 23b3c3213e
commit a483935cf8
3 changed files with 7 additions and 1 deletions

View File

@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog
- bug #3546277 [core] Call to undefined function __() when config file has wrong permissions
- bug #3540922 [edit] Error searching table with many fields
- bug #3555104 [edit] Cannot copy a DB with table & views
- bug #3559925 [privileges] Incorrect updating of the list of users
3.5.2.2 (2012-08-12)
- [security] Fixed XSS vulnerabilities, see PMASA-2012-4

View File

@ -415,6 +415,9 @@ $(document).ready(function() {
if (data.db_specific_privs == false || (db_priv_page == data.db_specific_privs)) {
reload_privs = true;
}
if (data.db_wildcard_privs) {
reload_privs = false;
}
//Change privileges, if they were edited and need to be reloaded
if(data.new_privileges && reload_privs) {

View File

@ -1507,8 +1507,10 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE
if (isset($update_privs)) {
$extra_data['db_specific_privs'] = false;
$extra_data['db_wildcard_privs'] = false;
if (isset($dbname_is_wildcard)) {
$extra_data['db_specific_privs'] = ! $dbname_is_wildcard;
$extra_data['db_wildcard_privs'] = $dbname_is_wildcard;
}
$new_privileges = join(', ', PMA_extractPrivInfo('', true));
@ -1891,7 +1893,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
. '<input type="hidden" name="username" value="' . htmlspecialchars($username) . '" />' . "\n"
. '<input type="hidden" name="hostname" value="' . htmlspecialchars($hostname) . '" />' . "\n"
. '<fieldset>' . "\n"
. '<legend>' . (! isset($dbname) ? __('Database-specific privileges') : __('Table-specific privileges')) . '</legend>' . "\n"
. '<legend>xx' . (! isset($dbname) ? __('Database-specific privileges') : __('Table-specific privileges')) . '</legend>' . "\n"
. '<table class="data">' . "\n"
. '<thead>' . "\n"
. '<tr><th>' . (! isset($dbname) ? __('Database') : __('Table')) . '</th>' . "\n"