- comment out setcharset() use in sqlite and mssql drivers (http://cvs.php.net/viewvc.cgi/pear/MDB2/MDB2/Driver/mssql.php?r1=1.177&r2=1.178)

git-svn-id: https://svn.roundcube.net/trunk@2112 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 4 insertions, 0 deletions

diff --git a/roundcubemail/program/lib/MDB2/Driver/mssql.php b/roundcubemail/program/lib/MDB2/Driver/mssql.php
index a16e33cbe..027447b08 100644
--- a/roundcubemail/program/lib/MDB2/Driver/mssql.php
+++ b/roundcubemail/program/lib/MDB2/Driver/mssql.php
@@ -349,12 +349,14 @@ class MDB2_Driver_mssql extends MDB2_Driver_Common
 

         @mssql_query('SET ANSI_NULL_DFLT_ON ON', $connection);

 

+/*
         if (!empty($this->dsn['charset'])) {

             $result = $this->setCharset($this->dsn['charset'], $connection);

             if (PEAR::isError($result)) {

                 return $result;

             }

         }

+*/
 

        if ((bool)ini_get('mssql.datetimeconvert')) {

            @ini_set('mssql.datetimeconvert', '0');

diff --git a/roundcubemail/program/lib/MDB2/Driver/sqlite.php b/roundcubemail/program/lib/MDB2/Driver/sqlite.php
index e48bac329..c8c485de6 100644
--- a/roundcubemail/program/lib/MDB2/Driver/sqlite.php
+++ b/roundcubemail/program/lib/MDB2/Driver/sqlite.php
@@ -412,12 +412,14 @@ class MDB2_Driver_sqlite extends MDB2_Driver_Common
                 'unable to establish a connection', __FUNCTION__);

             }

 

+/*
             if (!empty($this->dsn['charset'])) {

                 $result = $this->setCharset($this->dsn['charset'], $connection);

                 if (PEAR::isError($result)) {

                     return $result;

                 }

             }

+*/
 

             $this->connection = $connection;

             $this->connected_dsn = $this->dsn;