extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 09:28:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for egroupware.org bug #2842: Invalid array in class.calendar_uiviews.inc.php

Browse Source
This commit is contained in:
Ralf Becker 2011-03-28 10:41:23 +00:00
parent ea1ef050b8
commit 32f0131e08
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/inc/class.calendar_uiviews.inc.php
View File

@ -905,9 +905,13 @@ class calendar_uiviews extends calendar_ui
$cols = array();
//Add the holiday events
$dayEvents[$this->date] = array_merge(
$dayEvents[$this->date],
$this->_get_holiday_events($this->date, $this->display_holiday_event_types));
$holidays = $this->_get_holiday_events($this->date, $this->display_holiday_event_types);
foreach($dayEvents as &$events)
{
$events = array_merge($events,$holidays);
}
unset($events);
unset($holidays);
$cols[0] =& $this->timeGridWidget($this->tagWholeDayOnTop($dayEvents),$this->cal_prefs['interval'],450,'','',$owner);
@ -1839,7 +1843,7 @@ function open_edit(series)
}
$prefix_icon = isset($event['prepend_icon']) ? $event['prepend_icon'] : '';
$z_index = is_null($z_index) ? 20 : (int)$z_index;
// ATM we do not support whole day events or recurring events for dragdrop