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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2012-08-22 16:25:40 +02:00
commit 09437088a6
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -60,6 +60,7 @@ VerboseMultiSubmit, ReplaceHelpImg
- 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

3
js/server_privileges.js
View File

@ -412,6 +412,9 @@ $(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) {

2
libraries/server_privileges.lib.php
View File

@ -1911,8 +1911,10 @@ function PMA_getExtraDataForAjaxBehavior($password, $link_export, $sql_query,
if (isset($_POST['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));