mirror of
https://github.com/roundcube/roundcubemail.git
synced 2026-03-24 00:36:59 +01:00
- 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)
This commit is contained in:
@@ -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');
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user