Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -57,6 +57,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/core.lib.php

@@ -924,11 +924,7 @@ function PMA_addJSVar($key, $value, $escape = true)
 function PMA_mimeDefaultFunction($buffer)
 {
     $buffer = htmlspecialchars($buffer);
-    $buffer = str_replace(
-        "\011",
-        '    ',
-        str_replace('  ', '  ', $buffer)
-    );
+    $buffer = str_replace('  ', '  ', $buffer);
     $buffer = preg_replace("@((\015\012)|(\015)|(\012))@", '<br />' . "\n", $buffer);
 
     return $buffer;