extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-24 22:21:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix warning "Argument #1 is not an array" in calendar conflict

Browse Source
This commit is contained in:
Hadi Nategh 2014-02-12 11:59:32 +00:00
parent 22b66c9e3d
commit 874b4b594f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,7 +330,7 @@ class calendar_boupdate extends calendar_bo
{ {
foreach($conflicts as $key => $conflict) foreach($conflicts as $key => $conflict)
{ {
$conflict['participants'] = array_intersect_key($conflict['participants'],$event['participants']); $conflict['participants'] = array_intersect_key((array)$conflict['participants'],$event['participants']);
if (!$this->check_perms(EGW_ACL_READ,$conflict)) if (!$this->check_perms(EGW_ACL_READ,$conflict))
{ {
$conflicts[$key] = array( $conflicts[$key] = array(

6
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -1791,13 +1791,13 @@ class calendar_uiforms extends calendar_ui
'tooltip_participants' => $is_readable ? implode(', ',$this->bo->participants($conflict)) : '', 'tooltip_participants' => $is_readable ? implode(', ',$this->bo->participants($conflict)) : '',
'time' => $this->bo->long_date($conflict['start'],$conflict['end'],true), 'time' => $this->bo->long_date($conflict['start'],$conflict['end'],true),
'conflicting_participants' => implode(",\n",$this->bo->participants(array( 'conflicting_participants' => implode(",\n",$this->bo->participants(array(
'participants' => array_intersect_key($conflict['participants'],$event['participants']), 'participants' => array_intersect_key((array)$conflict['participants'],$event['participants']),
),true,true)), // show group invitations too ),true,true)), // show group invitations too
'icon_recur' => $conflict['recur_type'] != MCAL_RECUR_NONE ? 'recur' : '', 'icon_recur' => $conflict['recur_type'] != MCAL_RECUR_NONE ? 'recur' : '',
'text_recur' => $conflict['recur_type'] != MCAL_RECUR_NONE ? lang('Recurring event') : ' ', 'text_recur' => $conflict['recur_type'] != MCAL_RECUR_NONE ? lang('Recurring event') : ' ',
); );
$allConflicts += array_intersect_key($conflict['participants'],$event['participants']); $allConflicts += array_intersect_key((array)$conflict['participants'],$event['participants']);
} }
$content = $event + array( $content = $event + array(
'conflicts' => array_values($conflicts), // conflicts have id-start as key 'conflicts' => array_values($conflicts), // conflicts have id-start as key
); );