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

ChangeLog

@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
 - bug #4543 Changing column name can break saved "order by" clause
 - bug #4545 trying to favorite table while browser localStorage is disabled throws JS error
 - bug #4259 reCaptcha sound session expired problem
+- bug #4548 Inline editing a field converts tab to spaces
 
 4.2.9.0 (2014-09-20)
 - bug       ajax.js responseHandler: cannot read property of null

libraries/DisplayResults.class.php

@@ -6111,11 +6111,7 @@ class PMA_DisplayResults
     private function _mimeDefaultFunction($buffer)
     {
         $buffer = htmlspecialchars($buffer);
-        $buffer = str_replace(
-            "\011",
-            '    ',
-            str_replace('  ', '  ', $buffer)
-        );
+        $buffer = str_replace('  ', '  ', $buffer);
         $buffer = preg_replace("@((\015\012)|(\015)|(\012))@", '<br />', $buffer);
 
         return $buffer;