holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ralf Becker 2012-07-02 08:14:27 +00:00
parent 183fa30aca
commit e09a9c3198
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -533,12 +533,15 @@ class calendar_boupdate extends calendar_bo
case 'time_change_4h': case 'time_change_4h':
case 'time_change': case 'time_change':
default: default:
$diff = max(abs(self::date2ts($old_event['start'])-self::date2ts($new_event['start'])), if (is_array($new_event) && is_array($old_event))
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; $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': case 'add_cancel':
if ($msg_is_response && ($old_event['owner'] == $userid || $role == 'CHAIR') || if ($msg_is_response && ($old_event['owner'] == $userid || $role == 'CHAIR') ||