From 0324e37e697a3e3bf01d3ad96ed0916975f5a08b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 19 Aug 2012 06:54:15 -0400 Subject: [PATCH] Fix bug #3546478 (User initials not displayed) --- js/server_privileges.js | 1 + libraries/server_privileges.lib.php | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index 5303ac276f..363c938bb0 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -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") diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 278883b2d7..59bb84b85b 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -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