Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2012-08-19 12:54:39 +02:00
commit 932c7e2978
2 changed files with 1 additions and 4 deletions

View File

@ -546,6 +546,7 @@ $(function() {
$.get($(this).attr('href'), {'ajax_request' : true}, function(data) {
// This form is not on screen when first entering Privileges
// if there are more than 50 users
$("div.notice").remove();
$("#usersForm").hide("medium").remove();
$("#fieldset_add_user").hide("medium").remove();
$("#initials_table")

View File

@ -2841,10 +2841,6 @@ function PMA_getHtmlForDisplayUserOverviewPage($link_edit, $pmaThemeImage,
$html_output .= PMA_getAddUserHtmlFieldset($conditional_class);
} // end if (display overview)
if ($GLOBALS['is_ajax_request']) {
exit;
}
$flushnote = new PMA_Message(
__('Note: phpMyAdmin gets the users\' privileges directly from MySQL\'s privilege tables. The content of these tables may differ from the privileges the server uses, if they have been changed manually. In this case, you should %sreload the privileges%s before you continue.')
, PMA_Message::NOTICE