[Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    calendar
Changes by:     Sigurd Nes <sigurdne>   06/12/11 10:48:15

Modified files:
        inc            : class.bocalendar.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.bocalendar.inc.php?cvsroot=phpgroupware&r1=1.118&r2=1.119

Patches:
Index: class.bocalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- class.bocalendar.inc.php    11 Dec 2006 09:03:15 -0000      1.118
+++ class.bocalendar.inc.php    11 Dec 2006 10:48:15 -0000      1.119
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-       /* $Id: class.bocalendar.inc.php,v 1.118 2006/12/11 09:03:15 sigurdne 
Exp $ */
+       /* $Id: class.bocalendar.inc.php,v 1.119 2006/12/11 10:48:15 sigurdne 
Exp $ */
 
        class bocalendar
        {
@@ -448,7 +448,12 @@
                        {
                                foreach ( $group_owners as $group_info )
                                {
-                                       $this->g_owner[] = 
$this->contacts->is_contact($group_info['account_id']);
+                                       if($account_id = 
$this->contacts->is_contact($group_info['account_id']))
+                                       {
+                                               $this->g_owner[] = $account_id;
+                                       }
+
+                       //              $this->g_owner[] = 
$this->contacts->is_contact($group_info['account_id']);
                                }
                        }
                }
@@ -2793,6 +2798,7 @@
                {
                        $ret = !$this->prefs['calendar']['show_rejected'] && 
                                   $event['owner'] != $this->owner && 
+                                  isset($event['participants'][$this->owner]) 
&&
                                   $event['participants'][$this->owner] == 'R';
                        //echo "<p>rejected_no_show($event[title])='$ret': 
user=$this->owner, event-owner=$event[owner], 
status='".$event['participants'][$this->owner]."', 
show_rejected='".$this->prefs['calendar']['show_rejected']."'</p>\n";
                        return $ret;