fixed 5.4 PHP Warning: Illegal string offset 'start' or 'end'

This commit is contained in:
Ralf Becker 2012-07-02 08:14:27 +00:00
parent 183fa30aca
commit e09a9c3198

View File

@ -533,6 +533,8 @@ class calendar_boupdate extends calendar_bo
case 'time_change_4h': case 'time_change_4h':
case 'time_change': case 'time_change':
default: default:
if (is_array($new_event) && is_array($old_event))
{
$diff = max(abs(self::date2ts($old_event['start'])-self::date2ts($new_event['start'])), $diff = max(abs(self::date2ts($old_event['start'])-self::date2ts($new_event['start'])),
abs(self::date2ts($old_event['end'])-self::date2ts($new_event['end']))); abs(self::date2ts($old_event['end'])-self::date2ts($new_event['end'])));
$check = $ru == 'time_change_4h' ? 4 * 60 * 60 - 1 : 0; $check = $ru == 'time_change_4h' ? 4 * 60 * 60 - 1 : 0;
@ -540,6 +542,7 @@ class calendar_boupdate extends calendar_bo
{ {
++$want_update; ++$want_update;
} }
}
case 'add_cancel': case 'add_cancel':
if ($msg_is_response && ($old_event['owner'] == $userid || $role == 'CHAIR') || if ($msg_is_response && ($old_event['owner'] == $userid || $role == 'CHAIR') ||
$msg_type == MSG_DELETED || $msg_type == MSG_ADDED || $msg_type == MSG_DISINVITE) $msg_type == MSG_DELETED || $msg_type == MSG_ADDED || $msg_type == MSG_DISINVITE)