From b0a91accd88c875403cbfea2a5d50d46a3345fc6 Mon Sep 17 00:00:00 2001
From: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Date: Tue, 8 Jul 2014 17:40:10 +0530
Subject: [PATCH] Fix bug#4485 Sorting breaks the copy column feature

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
---
 ChangeLog      | 1 +
 js/makegrid.js | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d999b65ce3..58489d7293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
 - bug #4478 Server validation does not work while in setup/mysqli
 - bug       Undefined variable when grid editing a foreign key column
 - bug #4481 mult_submits.inc.php Undefined variable Error
+- bug #4485 Sorting breaks the copy column feature
 
 4.2.5.0 (2014-06-26)
 - bug #4467 shell_exec() has been disabled for security reasons
diff --git a/js/makegrid.js b/js/makegrid.js
index b877f1f67c..2b519b58dc 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1506,6 +1506,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                     })
                     .find("input").focus().select();
                 });
+            $(t).find('th.draggable a')
+                .dblclick(function (e) {
+                    e.stopPropagation();
+                });
             // restore column order when the restore button is clicked
             $('div.restore_column').click(function () {
                 g.restoreColOrder();