Rely on mysql server timezone not on PHP

git-svn-id: https://svn.roundcube.net/trunk@4746 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 6 insertions, 1 deletions

diff --git a/roundcubemail/program/include/rcube_mdb2.php b/roundcubemail/program/include/rcube_mdb2.php
index b25938bf8..365832806 100644
--- a/roundcubemail/program/include/rcube_mdb2.php
+++ b/roundcubemail/program/include/rcube_mdb2.php
@@ -574,7 +574,12 @@ class rcube_mdb2
      */
     function fromunixtime($timestamp)
     {
-        return date("'Y-m-d H:i:s'", $timestamp);
+        switch ($this->db_provider) {
+            case 'mysql':
+                return 'FROM_UNIXTIME(' . intval($timestamp) . ')';
+            default:
+                return date("'Y-m-d H:i:s'", $timestamp);
+        }
     }