Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6

ChangeLog

@@ -63,6 +63,7 @@ phpMyAdmin - ChangeLog
 - issue #12074 Fixed possible invalid SQL export
 - issue #12026 Fixed parsing of UNION SELECT with brackets
 - issue #12109 Fixed parsing of CREATE TABLE [AS] SELECT
+- issue #12105 Multi-server drap-and-drop import always fails
 
 4.5.5.1 (2016-02-29)
 - issue #11971 CREATE UNIQUE INDEX index type is not recognized by parser.

js/common.js

@@ -409,6 +409,8 @@ PMA_DROP_IMPORT = {
      */
     _drop: function (event) {
         var dbname = PMA_commonParams.get('db');
+        var server = PMA_commonParams.get('server');
+
         //if no database is selected -- no
         if (dbname !== '') {
             var files = event.originalEvent.dataTransfer.files;
@@ -449,6 +451,7 @@ PMA_DROP_IMPORT = {
                     fd.append('import_file', files[i]);
                     fd.append('noplugin', Math.random().toString(36).substring(2, 12));
                     fd.append('db', dbname);
+                    fd.append('server', server);
                     fd.append('token', PMA_commonParams.get('token'));
                     fd.append('import_type', 'database');
                     // todo: method to find the value below