Changeset 740 for trunk/lib/App.inc.php

Timestamp:

Nov 30, 2020 2:27:06 AM (3 years ago)

Author:

anonymous

Message:

 

File:

• trunk/lib/App.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -1879 +1879 @@
         }
 
-        // Create a DateTime object and conver the timezone from server to user.
-        $dt = $this->convertTZ($datetime, $this->getParam('php_timezone'), $this->getParam('user_timezone'));
+        try {
+            // Create a DateTime object and conver the timezone from server to user.
+            $dt = $this->convertTZ($datetime, $this->getParam('php_timezone'), $this->getParam('user_timezone'));
+        } catch (Exception $e) {
+            $this->logMsg(sprintf('DateTime failed to parse string in %s: %s', __METHOD__, $datetime), LOG_NOTICE, __FILE__, __LINE__);
+            return '';
+        }
 
         // By default, we try to use a localized date format. Set lc_date_format to null to use regular date_format instead.
@@ -1906 +1911 @@
     function dateToServerTZ($datetime, $format='Y-m-d H:i:s')
     {
-        return $this->convertTZ($datetime, $this->getParam('user_timezone'), $this->getParam('php_timezone'))->format($format);
+        try {
+            // Create a DateTime object and conver the timezone from server to user.
+            $dt = $this->convertTZ($datetime, $this->getParam('user_timezone'), $this->getParam('php_timezone'));
+        } catch (Exception $e) {
+            $this->logMsg(sprintf('DateTime failed to parse string in %s: %s', __METHOD__, $datetime), LOG_NOTICE, __FILE__, __LINE__);
+            return '';
+        }
+
+        return $dt->format($format);
     }