summaryrefslogtreecommitdiff
path: root/program/lib/Roundcube/rcube_utils.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-11-27 11:40:40 +0100
committerAleksander Machniak <alec@alec.pl>2014-11-27 11:40:40 +0100
commit32eb977b1268ce1e32ab652af6059f49ce59c2f5 (patch)
tree12be25c273913dfbf581397b36b20d5b05e51dfe /program/lib/Roundcube/rcube_utils.php
parent2f4678908170b8af04a0eae2195bb3c0f732ed58 (diff)
parent25fb9732a008d4fb35e4afdefea552f36835fa43 (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.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
index a51247eae..add97ee07 100644
--- a/program/lib/Roundcube/rcube_utils.php
+++ b/program/lib/Roundcube/rcube_utils.php
@@ -797,7 +797,7 @@ class rcube_utils
// try to parse string with DateTime first
if (!empty($date)) {
try {
- $dt = new DateTime($date, $timezone);
+ $dt = $timezone ? new DateTime($date, $timezone) : new DateTime($date);
}
catch (Exception $e) {
// ignore