From e09a9c319836e5176cfe62c609685c474969851f Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 2 Jul 2012 08:14:27 +0000
Subject: [PATCH] fixed 5.4 PHP Warning: Illegal string offset 'start' or
'end'
---
calendar/inc/class.calendar_boupdate.inc.php | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index bd756d39e6..96ad45c540 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -533,12 +533,15 @@ class calendar_boupdate extends calendar_bo
case 'time_change_4h':
case 'time_change':
default:
- $diff = max(abs(self::date2ts($old_event['start'])-self::date2ts($new_event['start'])),
- abs(self::date2ts($old_event['end'])-self::date2ts($new_event['end'])));
- $check = $ru == 'time_change_4h' ? 4 * 60 * 60 - 1 : 0;
- if ($msg_type == MSG_MODIFIED && $diff > $check)
+ if (is_array($new_event) && is_array($old_event))
{
- ++$want_update;
+ $diff = max(abs(self::date2ts($old_event['start'])-self::date2ts($new_event['start'])),
+ abs(self::date2ts($old_event['end'])-self::date2ts($new_event['end'])));
+ $check = $ru == 'time_change_4h' ? 4 * 60 * 60 - 1 : 0;
+ if ($msg_type == MSG_MODIFIED && $diff > $check)
+ {
+ ++$want_update;
+ }
}
case 'add_cancel':
if ($msg_is_response && ($old_event['owner'] == $userid || $role == 'CHAIR') ||