From dec9e85eaebaeaca92fbcb8bc581e6756b1c608f Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 3 Aug 2009 11:33:53 +0000
Subject: - Fix rcube_mdb2.php: call to setCharset not implemented in mssql
 driver (#1486019)

---
 CHANGELOG                      | 1 +
 program/include/rcube_mdb2.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index c90960de7..69d63de97 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix rcube_mdb2.php: call to setCharset not implemented in mssql driver (#1486019)
 - Added 'display_next' option
 - Fix rcube_mdb2::unixtimestamp for MS SQL (#1486015)
 - Fix HTML washing to respect character encoding
diff --git a/program/include/rcube_mdb2.php b/program/include/rcube_mdb2.php
index 610aaf50a..12f3c1652 100644
--- a/program/include/rcube_mdb2.php
+++ b/program/include/rcube_mdb2.php
@@ -106,7 +106,7 @@ class rcube_mdb2
       if (!filesize($dsn_array['database']) && !empty($this->sqlite_initials))
         $this->_sqlite_create_database($dbh, $this->sqlite_initials);
       }
-    else
+    else if ($this->db_provider!='mssql')
       $dbh->setCharset('utf8');
 
     return $dbh;
-- 
cgit v1.2.3