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

fixed issue / applied patch [ 1445457 ] handling of non_blocking events

Browse Source
This commit is contained in:
Ralf Becker 2006-03-08 10:23:44 +00:00
parent 4b1f545141
commit a580524693
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -430,6 +430,8 @@ class bocal
'title' => lang('private'), 'title' => lang('private'),
'participants' => array_intersect_key($event['participants'],array_flip($allowed_participants)), 'participants' => array_intersect_key($event['participants'],array_flip($allowed_participants)),
'public'=> 0, 'public'=> 0,
'category' => $event['category'], // category is visible anyway, eg. by using planner by cat
'non_blocking' => $event['non_blocking'],
); );
} }

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

@ -983,6 +983,8 @@ class uiforms extends uical
{ {
if ((int)$cal_id && $event['id'] == (int)$cal_id) continue; // ignore our own event if ((int)$cal_id && $event['id'] == (int)$cal_id) continue; // ignore our own event
if ($event['non_blocking']) continue; // ignore non_blocking events
if ($this->debug) if ($this->debug)
{ {
echo "<p>ft_start=".date('D d.m.Y H:i',$ft_start)."<br>\n"; echo "<p>ft_start=".date('D d.m.Y H:i',$ft_start)."<br>\n";