[Fmsystem-commits] [10765] calendar: user vs contact

[Sigurd Nes]

Revision: 10765
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10765
Author:   sigurdne
Date:     2013-02-06 10:00:28 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
calendar: user vs contact

Modified Paths:
--------------
    trunk/calendar/inc/class.bocalendar.inc.php

Modified: trunk/calendar/inc/class.bocalendar.inc.php
===================================================================
--- trunk/calendar/inc/class.bocalendar.inc.php 2013-02-06 09:52:37 UTC (rev 
10764)
+++ trunk/calendar/inc/class.bocalendar.inc.php 2013-02-06 10:00:28 UTC (rev 
10765)
@@ -2437,7 +2437,7 @@
 
                        if (!$user)
                        {
-                               $user = $this->owner;
+                               $user =  
$GLOBALS['phpgw']->accounts->search_person($this->owner);
                        }
                        $GLOBALS['phpgw_info']['user']['preferences'] = 
$GLOBALS['phpgw']->preferences->create_email_preferences($user);
 
@@ -2911,7 +2911,9 @@
 
                        $cats = array();
                        $cat_string[] = '';
-                       $this->cat->categories($this->owner,'calendar');
+
+                       
$this->cat->__construct($GLOBALS['phpgw']->accounts->search_person($this->owner),'calendar');
+
                        if(strpos($event['category'],','))
                        {
                                $cats = explode(',',$event['category']);