[Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php,1.118

[skwashd]

Update of calendar/inc

Modified Files:
     Branch: MAIN
            class.uicalendar.inc.php lines: +12 -2

Log Message:
fix for beug #3853

====================================================
Index: calendar/inc/class.uicalendar.inc.php
diff -u calendar/inc/class.uicalendar.inc.php:1.117 
calendar/inc/class.uicalendar.inc.php:1.118
--- calendar/inc/class.uicalendar.inc.php:1.117 Fri Nov 18 11:40:45 2005
+++ calendar/inc/class.uicalendar.inc.php       Tue Dec  6 10:42:26 2005
@@ -2692,7 +2692,17 @@
                        for($i=0;$i<count($overlapping_events);$i++)
                        {
                                $overlapped_event = 
$this->bo->read_entry($overlapping_events[$i]);
-                               $overlap .= '<li> 
['.$this->bo->contacts->get_name_of_person_id($overlapped_event['owner']).'] 
'.$this->link_to_entry($overlapped_event,$month,$mday,$year);
+                               if ( is_array($overlapped_event) )
+                               {
+                                       $overlap .= '<li> 
['.$this->bo->contacts->get_name_of_person_id($overlapped_event['owner']).'] ' 
. $this->link_to_entry($overlapped_event,$month,$mday,$year) . "</li>\n";
+                               }
+                               else //must be private
+                               {
+                                       // this is a hack to get around the 
limitations of the current code
+                                       // FIXME remove the need for such a 
nasty hack by adding a better arg to bocal::read_entry
+                                       $overlapped_event = 
$this->bo->so->read_entry($overlapping_events[$i]);
+                                       $overlap .= '<li> 
['.$this->bo->contacts->get_name_of_person_id($overlapped_event['owner']).'] '. 
lang('private') . "</li>\n";
+                               }
                        }

                        unset($GLOBALS['phpgw_info']['flags']['noheader']);