nettika/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:
Pootle server
2011-03-02 20:40:04 +01:00
parent a0c6de2f8a f07a0842f0
commit 5f7c9c6615
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/server_privileges.js
View File

@@ -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);

5
libraries/common.lib.php
View File

@@ -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 '</div>';
}
echo '</div><br class="clearfloat" />' . "\n";
echo '</div>';
if ($GLOBALS['is_ajax_request'] === false) {
echo '<br class="clearfloat" />';
}
// If we are in an Ajax request, we have most probably been called in
// PMA_ajaxResponse(). Hence, collect the buffer contents and return it