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

Fixed ajax-loaded users privileges pages

Browse Source
This commit is contained in:
Rouslan Placella 2012-07-21 14:46:33 +01:00
parent 4db80fc880
commit e27fd3394a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/server_privileges.lib.php
View File

@ -1825,6 +1825,7 @@ function PMA_getExtraDataForAjaxBehavior($password, $link_export, $sql_query,
}
}
$extra_data = array();
if (strlen($sql_query)) {
$extra_data['sql_query']
= PMA_Util::getMessage(null, $sql_query);
@ -2987,9 +2988,6 @@ function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage,
$flushnote->addParam('</a>', false);
$html_output .= $flushnote->getDisplay();
}
if ($GLOBALS['is_ajax_request']) {
exit;
}
return $html_output;
}
}

1
server_privileges.php
View File

@ -378,6 +378,7 @@ list($link_edit, $link_revoke, $link_export)
* Flush Privileges, show $message and exit.
*/
if ($GLOBALS['is_ajax_request']
&& empty($_REQUEST['ajax_page_request'])
&& ! isset($_REQUEST['export'])
&& (! isset($_REQUEST['submit_mult']) || $_REQUEST['submit_mult'] != 'export')
&& (! isset($_REQUEST['adduser']) || $_add_user_error)