Merge pull request #741 from Tithugues/fix-convertString

Fix PMA_convertString which use a wrong variable.
phpmyadmin · Nov 6, 2013 · e604155 · e604155
2 parents 2f3e1ea + c1194cc
commit e604155
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
@@ -104,7 +104,7 @@ function PMA_convertString($src_charset, $dest_charset, $what)
         );
     case PMA_CHARSET_MB:
         return mb_convert_encoding(
-            $message, $dest_charset, $src_charset
+            $what, $dest_charset, $src_charset
         );
     default:
         return $what;