From: Jakub Vrana <jakub@vrana.cz>
Date: Tue, 9 Aug 2011 09:51:18 +0000 (+0200)
Subject: Decode Windows error message
X-Git-Tag: v3.3.3~20
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=c75ee443878831f7fecbc6d5b0007bd0a859bf86;p=adminer.git

Decode Windows error message
---

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