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

ChangeLog

@@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
 - issue #12121 Fixed error in 3NF step of normalization
 - issue #12135 Fix offering JSON datatype in incompatible MySQL versions
 - issue #12132 Can not open table with JSON field
+- issue #12125 Cannot highlight a column if I scroll down from the top of the table
 
 4.6.0.0 (2016-03-22)
 + issue #11456 Disabled storage engines

js/sql.js

@@ -651,7 +651,11 @@ function PMA_changeClassForColumn($this_th, newclass, isAddClass)
     if (has_big_t) {
         th_index--;
     }
-    var $tds = $this_th.parents(".table_results").find('tbody tr').find('td.data:eq(' + th_index + ')');
+    var $table = $this_th.parents('.table_results');
+    if (! $table.length) {
+        $table = $this_th.parents('table').siblings('.table_results');
+    }
+    var $tds = $table.find('tbody tr').find('td.data:eq(' + th_index + ')');
     if (isAddClass === undefined) {
         $tds.toggleClass(newclass);
     } else {