diff options
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_mdb2.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index c90960de7..69d63de97 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/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/roundcubemail/program/include/rcube_mdb2.php b/roundcubemail/program/include/rcube_mdb2.php index 610aaf50a..12f3c1652 100644 --- a/roundcubemail/program/include/rcube_mdb2.php +++ b/roundcubemail/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; |