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

ChangeLog

@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
 - bug #4826 Two inline edit windows
 - bug #4979 Problem when import *.ods file
 - bug       Add missing head tag
+- bug #4985 Column headers move when scrolling
 
 4.4.11.0 (2015-07-06)
 - bug       Missing selected/entered values when editing active options in visual query builder

libraries/DisplayResults.class.php

@@ -1417,11 +1417,6 @@ class PMA_DisplayResults
                 = (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
                 && ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE)) ? 4 : 0;
 
-            $button_html .= '<th colspan="' . $this->__get('fields_cnt') . '">'
-                . '</th>'
-                . '</tr>'
-                . '<tr>';
-
         } elseif ((($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT)
             || ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_BOTH))
             && ($displayParts['text_btn'] == '1')