From e70990a7bba5b67150dc711eafe83af47b36ac82 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 13 Aug 2018 15:22:09 +0200 Subject: [PATCH] fix wrongly displayed time in alarms --- calendar/inc/class.calendar_uiforms.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index b248ff68f3..1c7b9ac0fd 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -1777,6 +1777,8 @@ class calendar_uiforms extends calendar_ui continue; // no read rights to the calendar of the alarm-owner, dont show the alarm } $alarm['all'] = (int) $alarm['all']; + // fix alarm time in case of alread run alarms, where the time will be their keep_time / when they will be cleaned up otherwise + $alarm['time'] = $event['start'] - $alarm['offset']; $after = false; if($alarm['offset'] < 0) { @@ -1798,8 +1800,6 @@ class calendar_uiforms extends calendar_ui { $alarm['offset'] = implode(', ',$label) . ' ' . ($after ? lang('after') : lang('before')); } - // fix alarm time in case of alread run alarms, where the time will be their keep_time / when they will be cleaned up otherwise - $alarm['time'] = $event['start'] - $alarm['offset']; $content['alarm'][] = $alarm; $readonlys['alarm[delete_alarm]['.$alarm['id'].']'] = !$this->bo->check_perms(Acl::EDIT,$alarm['all'] ? $event : 0,$alarm['owner']);