diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-08-01 12:50:00 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-08-01 12:50:00 +0200 |
| commit | 5af3b33f97695bd174c36851117523cd37569bf8 (patch) | |
| tree | 8ba2818db2beeac1f3e989f45b8bc4f64370966a /program/lib/Roundcube/rcube_utils.php | |
| parent | fcb7d4fc034335d960917abd37254bd3997cf2f3 (diff) | |
| parent | ea5d7498224e4087f63ab3726162576c067c01d4 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/lib/Roundcube/rcube_utils.php')
| -rw-r--r-- | program/lib/Roundcube/rcube_utils.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php index 00999ba50..39e27fc7f 100644 --- a/program/lib/Roundcube/rcube_utils.php +++ b/program/lib/Roundcube/rcube_utils.php @@ -795,7 +795,7 @@ class rcube_utils * * @return object DateTime instance or false on failure */ - public static function anytodatetime($date) + public static function anytodatetime($date, $timezone = null) { if (is_object($date) && is_a($date, 'DateTime')) { return $date; @@ -807,7 +807,7 @@ class rcube_utils // try to parse string with DateTime first if (!empty($date)) { try { - $dt = new DateTime($date); + $dt = new DateTime($date, $timezone); } catch (Exception $e) { // ignore |