mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-27 08:19:45 +01:00
fixed prob. with included events not shown, if no cal-event on that day
This commit is contained in:
parent
65d4d6b484
commit
a8a8adf55c
@ -3287,12 +3287,12 @@
|
||||
$day_end = mktime(intval($this->bo->prefs['calendar']['workdayends']),0,1,$params['month'],$params['day'],$params['year']);
|
||||
$daily = $this->set_week_array($GLOBALS['phpgw']->datetime->get_weekday_start($params['year'],$params['month'],$params['day']),$this->theme['row_on'],True);
|
||||
print_debug('Date to Eval',$date_to_eval);
|
||||
$events_to_show = array();
|
||||
if($daily[$date_to_eval]['appts'])
|
||||
{
|
||||
$events = $this->bo->cached_events[$date_to_eval];
|
||||
print_debug('Date',$date_to_eval);
|
||||
print_debug('Count',count($events));
|
||||
$events_to_show = array();
|
||||
foreach($events as $event)
|
||||
{
|
||||
if ($this->bo->rejected_no_show($event))
|
||||
@ -3309,6 +3309,7 @@
|
||||
'content' => $this->link_to_entry($event,$params['month'],$params['day'],$params['year'])
|
||||
);
|
||||
}
|
||||
}
|
||||
//echo "events_to_show=<pre>"; print_r($events_to_show); echo "</pre>\n";
|
||||
$other = $GLOBALS['phpgw']->hooks->process(array(
|
||||
'location' => 'calendar_include_events',
|
||||
@ -3331,6 +3332,8 @@
|
||||
//echo "events_to_show=<pre>"; print_r($events_to_show); echo "</pre>\n";
|
||||
}
|
||||
|
||||
if (count($events_to_show))
|
||||
{
|
||||
$last_slot_end = -1;
|
||||
foreach($events_to_show as $event)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user