From 5946e9f7cd74bbfa7070b0f9cb12f81a449a24d4 Mon Sep 17 00:00:00 2001 From: nathangray Date: Tue, 31 Jan 2017 09:14:50 -0700 Subject: [PATCH] Avoid errors if $instance_date is not passed correctly (thanks, Scrutenizer) --- calendar/inc/class.calendar_boupdate.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php index c9bf0288be..0138c96bf2 100644 --- a/calendar/inc/class.calendar_boupdate.inc.php +++ b/calendar/inc/class.calendar_boupdate.inc.php @@ -1920,7 +1920,7 @@ class calendar_boupdate extends calendar_bo foreach($event['alarm'] as &$alarm) { - if($event['recur_type'] != MCAL_RECUR_NONE) + if($event['recur_type'] != MCAL_RECUR_NONE && is_object($instance_date)) { calendar_so::shift_alarm($event, $alarm, $instance_date->format('ts')); }