adjustment to make sure we always have a valid timezone set, even whe…

…n converting from w2p
web2project · Jul 17, 2014 · dae8d20 · dae8d20
1 parent 3570f05
commit dae8d20
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/classes/w2p/Core/CAppUI.class.php b/classes/w2p/Core/CAppUI.class.php
@@ -242,6 +242,7 @@ public function convertToSystemTZ($datetime = '', $format = 'Y-m-d H:i:s')
     public function formatTZAwareTime($datetime = '', $format = '')
     {
         $userTimezone = $this->getPref('TIMEZONE');
+        $userTimezone = ('' == $userTimezone) ? 'UTC' : $userTimezone;
         $userTZ = new DateTimeZone($userTimezone);
         $systemTZ = new DateTimeZone('UTC');
         $ts = new DateTime($datetime, $systemTZ);