From d2ad23972b3cbcf1cb1a31c308522e51eb68b16d Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Mon, 21 Mar 2016 17:56:47 +0530 Subject: [PATCH] Fix #12105 : Multi-server drag-drop-import always fails Signed-off-by: Deven Bansod --- ChangeLog | 1 + js/common.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index d8ebf81ea0..2d143a0f28 100644 --- a/ChangeLog +++ b/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. diff --git a/js/common.js b/js/common.js index 0639914738..83733bf3eb 100644 --- a/js/common.js +++ b/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