Decode Windows error message

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 7c54656066522082f959b096eef68a88e629b5c8..9b5ca98200fb0380d548a9a2a275e0ad14a7d94d 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -253,7 +253,11 @@ if (!defined("DRIVER")) {
                        $connection->query("SET sql_quote_show_create = 1");
                        return $connection;
                }
-               return $connection->error;
+               $return = $connection->error;
+               if (function_exists('iconv') && !is_utf8($return) && strlen($s = iconv("windows-1250", "utf-8", $return)) > strlen($return)) { // windows-1250 - most common Windows encoding
+                       $return = $s;
+               }
+               return $return;
        }
 
        /** Get cached list of databases