]> git.joonet.de Git - adminer.git/commitdiff
Specify UTF-8 (bug #3097662)
authorJakub Vrana <jakub@vrana.cz>
Fri, 19 Nov 2010 15:14:17 +0000 (16:14 +0100)
committerJakub Vrana <jakub@vrana.cz>
Fri, 19 Nov 2010 15:14:17 +0000 (16:14 +0100)
adminer/drivers/oracle.inc.php

index 888b7cf32a0897a6a18b9409b7af2609890f82ec..05d3bebe44b0e4f5f7bb8c43f7ef1260663138fe 100644 (file)
@@ -17,7 +17,7 @@ if (isset($_GET["oracle"])) {
                        }
                        
                        function connect($server, $username, $password) {
-                               $this->_link = @oci_new_connect($username, $password, $server); //! AL32UTF8
+                               $this->_link = @oci_new_connect($username, $password, $server, "AL32UTF8");
                                if ($this->_link) {
                                        $this->server_info = oci_server_version($this->_link);
                                        return true;
@@ -119,7 +119,7 @@ if (isset($_GET["oracle"])) {
                        var $extension = "PDO_OCI";
                        
                        function connect($server, $username, $password) {
-                               $this->dsn("oci:dbname=//$server", $username, $password);
+                               $this->dsn("oci:dbname=//$server;charset=AL32UTF8", $username, $password);
                                return true;
                        }