Set character set right after connect

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@783 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index f51ea6b2a43d0b28848a0d719850090c98c4a011..434b023a79e4bc9cdd51940888e91cf40d52c762 100644 (file)
--- a/adminer/include/connect.inc.php
+++ b/adminer/include/connect.inc.php
@@ -26,4 +26,3 @@ if (!(strlen($_GET["db"]) ? $dbh->select_db($_GET["db"]) : isset($_GET["sql"]) |
        connect_error(); // separate function to catch SQLite error
        exit;
 }
-$dbh->query("SET CHARACTER SET utf8");

diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index ab8cd640ee2750e5a53fc4a93849e9e5baebb9a1..eb4dc9de61c6ef07b5de3843973f565a66b02c66 100644 (file)
--- a/adminer/include/mysql.inc.php
+++ b/adminer/include/mysql.inc.php
@@ -207,6 +207,7 @@ function connect() {
        $dbh = new Min_DB;
        if ($dbh->connect($_GET["server"], $_SESSION["usernames"][$_GET["server"]], $_SESSION["passwords"][$_GET["server"]])) {
                $dbh->query("SET SQL_QUOTE_SHOW_CREATE=1");
+               $dbh->query("SET NAMES utf8");
                return $dbh;
        }
        return $dbh->error;

diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index 7fe0ee6fa03cc850389a0991bd807bea6bf19604..6f2847cb2101849f22217e7ca9e906964d909914 100644 (file)
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -17,7 +17,6 @@ if (!$error && $_POST) {
                $dbh2 = (strlen($_GET["db"]) ? connect() : null); // connection for exploring indexes (to not replace FOUND_ROWS()) //! PDO - silent error
                if (is_object($dbh2)) {
                        $dbh2->select_db($_GET["db"]);
-                       $dbh2->query("SET CHARACTER SET utf8");
                }
                while (strlen($query)) {
                        if (!$offset && preg_match('~^\\s*DELIMITER\\s+(.+)~i', $query, $match)) {