Merge branch 'QA_4_4'

ChangeLog

@@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog
 - bug #4813 MySQL 5.7.6 and the Users menu tab
 - bug #4818 MySQL 5.7.6 and changing the password for another user
 - bug #4819 Request URI too large
+- bug       Use 'server' parameter in console to work in multi server environments
 
 4.4.0.0 (not yet released)
 + rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time

js/console.js

@@ -906,6 +906,7 @@ var PMA_consoleMessages = {
             if(confirm(PMA_messages.strConsoleDeleteBookmarkConfirm + '\n' + $message.find('.bookmark_label').text())) {
                 $.post('import.php',
                     {token: PMA_commonParams.get('token'),
+                    server: PMA_commonParams.get('server'),
                     action_bookmark: 2,
                     ajax_request: true,
                     id_bookmark: $message.attr('bookmarkid')},
@@ -1010,8 +1011,11 @@ var PMA_consoleBookmarks = {
         }
     },
     refresh: function () {
-        $.get('import.php?console_bookmark_refresh=refresh&token=' + PMA_commonParams.get('token'),
-            {'ajax_request': true},
+        $.get('import.php',
+            {ajax_request: true,
+            token: PMA_commonParams.get('token'),
+            server: PMA_commonParams.get('server'),
+            console_bookmark_refresh: 'refresh'},
             function(data) {
                 if(data.console_message_bookmark) {
                     $('#pma_bookmarks .content.bookmark').html(data.console_message_bookmark);
@@ -1048,6 +1052,7 @@ var PMA_consoleBookmarks = {
                 ajax_request: true,
                 console_bookmark_add: 'true',
                 label: $('#pma_bookmarks .card.add [name=label]').val(),
+                server: PMA_commonParams.get('server'),
                 db: $('#pma_bookmarks .card.add [name=targetdb]').val(),
                 bookmark_query: PMA_consoleInput.getText('bookmark'),
                 shared: $('#pma_bookmarks .card.add [name=shared]').prop('checked')},