beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Set character set right after connect

Browse source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@783 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2009-07-03 05:14:49 +00:00
parent 2c445a86c1
commit 70ade15c9f
3 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
adminer/include/connect.inc.php
View file

@ -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");

1
adminer/include/mysql.inc.php
View file

@ -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;

1
adminer/sql.inc.php
View file

@ -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)) {