From 419d067dc348817c79386fba10cc1679df486729 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 2 Mar 2011 13:01:17 -0500 Subject: [PATCH 1/2] Extra line break generated when creating user via Ajax --- libraries/common.lib.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 4f8427b0a..2b7f738ac 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1269,7 +1269,10 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view echo $edit_link . $explain_link . $php_link . $refresh_link . $validate_link; echo ''; } - echo '
' . "\n"; + echo ''; + if ($GLOBALS['is_ajax_request'] === false) { + echo '
'; + } // If we are in an Ajax request, we have most probably been called in // PMA_ajaxResponse(). Hence, collect the buffer contents and return it From f07a0842f0016c4bd1596423346d38f462590b6b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 2 Mar 2011 13:03:24 -0500 Subject: [PATCH 2/2] Cache jQuery object to avoid unneeded DOM traversal --- js/server_privileges.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index 816006685..332ad6b85 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -193,9 +193,9 @@ $(document).ready(function() { .after(data.sql_query); //Remove the empty notice div generated due to a NULL query passed to PMA_showMessage() - var notice_class = $("#topmenucontainer").next("div").find('.notice'); - if($(notice_class).text() == '') { - $(notice_class).remove(); + var $notice_class = $("#topmenucontainer").next("div").find('.notice'); + if($notice_class.text() == '') { + $notice_class.remove(); } appendNewUser(data.new_user_string, data.new_user_initial, data.new_user_initial_string);