summaryrefslogtreecommitdiff
path: root/program/lib/MDB2
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-12-03 14:48:26 +0000
committeralecpl <alec@alec.pl>2008-12-03 14:48:26 +0000
commit4189ccf44a79d14c8faecefa8f87f8dde5dd492f (patch)
tree84d2456146bdb832a034b6e01825291bdfc30569 /program/lib/MDB2
parent97840cb795f6459f194da641616f2556db8645da (diff)
- 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)
Diffstat (limited to 'program/lib/MDB2')
-rw-r--r--program/lib/MDB2/Driver/mssql.php2
-rw-r--r--program/lib/MDB2/Driver/sqlite.php2
2 files changed, 4 insertions, 0 deletions
diff --git a/program/lib/MDB2/Driver/mssql.php b/program/lib/MDB2/Driver/mssql.php
index a16e33cbe..027447b08 100644
--- a/program/lib/MDB2/Driver/mssql.php
+++ b/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/program/lib/MDB2/Driver/sqlite.php b/program/lib/MDB2/Driver/sqlite.php
index e48bac329..c8c485de6 100644
--- a/program/lib/MDB2/Driver/sqlite.php
+++ b/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;