From c75ee443878831f7fecbc6d5b0007bd0a859bf86 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Tue, 9 Aug 2011 11:51:18 +0200 Subject: [PATCH] Decode Windows error message --- adminer/drivers/mysql.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php index 7c546560..9b5ca982 100644 --- 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