diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-04-08 06:33:50 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-04-08 06:33:50 +0000 |
| commit | daf588567fea95c414a2d67bd8c62b4aa34e104d (patch) | |
| tree | 4535c320be6054dec7df6e0b7f6fafdcd3bbb27c | |
| parent | cc7401827a0e3345c83db7756b6748d0042fc176 (diff) | |
- Fixed bug where some dates would produce SQL error in MySQL (#1487856)
git-svn-id: https://svn.roundcube.net/trunk@4635 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_mdb2.php | 10 |
2 files changed, 2 insertions, 9 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 11b11fc00..a38bbd6f1 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fixed bug where some dates would produce SQL error in MySQL (#1487856) - Added workaround for some IMAP server with broken STATUS response (#1487859) - Fix bug where default_charset was not used for text messages (#1487836) - Enable TinyMCE's contextmenu (#1487014) diff --git a/roundcubemail/program/include/rcube_mdb2.php b/roundcubemail/program/include/rcube_mdb2.php index 85a70cad3..36a595098 100644 --- a/roundcubemail/program/include/rcube_mdb2.php +++ b/roundcubemail/program/include/rcube_mdb2.php @@ -570,15 +570,7 @@ class rcube_mdb2 */ function fromunixtime($timestamp) { - switch($this->db_provider) { - case 'mysqli': - case 'mysql': - case 'sqlite': - return sprintf("FROM_UNIXTIME(%d)", $timestamp); - - default: - return date("'Y-m-d H:i:s'", $timestamp); - } + return date("'Y-m-d H:i:s'", $timestamp); } |