From 7a6c7fef21a110c2a6b82873a84958710c8ece7e Mon Sep 17 00:00:00 2001 From: demeritcowboy Date: Tue, 25 Jan 2022 10:51:08 -0500 Subject: [PATCH] prevent E_NOTICE and prevent blank dates being converted to current date/time --- CRM/Event/Page/ManageEvent.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CRM/Event/Page/ManageEvent.php b/CRM/Event/Page/ManageEvent.php index c25dcf9400..356710c81d 100644 --- 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; -- 2.25.1