prevent E_NOTICE and prevent blank dates being converted to current date/time

diff --git a/CRM/Event/Page/ManageEvent.php b/CRM/Event/Page/ManageEvent.php
index c25dcf9400ac89e50373cfc112cc967f4bd4e85f..356710c81d4e5ada998eab76d30f96e7f08098e5 100644 (file)
--- a/CRM/Event/Page/ManageEvent.php
+++ b/CRM/Event/Page/ManageEvent.php
@@ -361,9 +361,15 @@ ORDER BY start_date desc
         }
         CRM_Core_DAO::storeValues($dao, $manageEvent[$dao->id]);
 
+        // avoid enotices
+        foreach (CRM_Event_BAO_Event::tz_fields as $field) {
+          $manageEvent[$dao->id][$field . '_with_tz'] = NULL;
+        }
         if (!is_null($dao->event_tz) && $dao->event_tz != CRM_Core_Config::singleton()->userSystem->getTimeZoneString()) {
           foreach (CRM_Event_BAO_Event::tz_fields as $field) {
-            $manageEvent[$dao->id][$field . '_with_tz'] = CRM_Utils_Date::convertTimeZone($dao->{$field} ?? '', $dao->event_tz);
+            if (!empty($dao->{$field})) {
+              $manageEvent[$dao->id][$field . '_with_tz'] = CRM_Utils_Date::convertTimeZone($dao->{$field}, $dao->event_tz);
+            }
           }
         }
         $manageEvent[$dao->id]['event_tz'] = $dao->event_tz ? CRM_Core_SelectValues::timezone()[$dao->event_tz] : FALSE;