Specify quoting charset in PDO_MySQL

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index cbba07e2d8dc5c605ed3ea8aacf45760ed622cc8..55d31df8a961b85d97bf06d38e481a0acf26b9b0 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -211,8 +211,8 @@ if (!defined("DRIVER")) {
                        var $extension = "PDO_MySQL";
 
                        function connect($server, $username, $password) {
-                               $this->dsn("mysql:host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\\d)~', ';port=\\1', $server)), $username, $password);
-                               $this->query("SET NAMES utf8"); // charset in DSN is ignored
+                               $this->dsn("mysql:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\\d)~', ';port=\\1', $server)), $username, $password);
+                               $this->query("SET NAMES utf8"); // charset in DSN is ignored before PHP 5.3.6
                                return true;
                        }