[Fmsystem-commits] [9091]

[Erik Holm-Larsen]

Revision: 9091
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9091
Author:   erikhl
Date:     2012-04-03 10:21:06 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/model/class.activity.inc.php

Modified: trunk/activitycalendar/inc/model/class.activity.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.activity.inc.php     2012-04-03 
07:48:18 UTC (rev 9090)
+++ trunk/activitycalendar/inc/model/class.activity.inc.php     2012-04-03 
10:21:06 UTC (rev 9091)
@@ -258,8 +258,9 @@
                                else
                                {
                                        $group_name = 
activitycalendar_sogroup::get_instance()->get_group_name($this->get_group_id());
-                                       $contact_1 = 
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_1());
-                                       $contact_2 = 
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_2());
+                                       
$this->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($this->get_group_id(),
 true));
+                                       $contact_1 = 
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_1()->get_id());
+                                       $contact_2 = 
activitycalendar_socontactperson::get_instance()->get_group_contact_name($this->get_contact_person_2()->get_id());
                                        $desc = 
activitycalendar_sogroup::get_instance()->get_description($this->get_group_id());
                                }
                                $org_name = 
activitycalendar_soorganization::get_instance()->get_organization_name($this->get_organization_id());
@@ -276,8 +277,9 @@
                                else
                                {
                                        $org_name = 
activitycalendar_soorganization::get_instance()->get_organization_name($this->get_organization_id());
-                                       $contact_1 = 
activitycalendar_socontactperson::get_instance()->get_org_contact_name($this->get_contact_person_1());
-                                       $contact_2 = 
activitycalendar_socontactperson::get_instance()->get_org_contact_name($this->get_contact_person_2());
+                                       
$this->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_booking_contact_persons($this->get_organization_id()));
+                                       $contact_1 = 
activitycalendar_socontactperson::get_instance()->get_org_contact_name($this->get_contact_person_1()->get_id());
+                                       $contact_2 = 
activitycalendar_socontactperson::get_instance()->get_org_contact_name($this->get_contact_person_2()->get_id());
                                        $desc = 
activitycalendar_soorganization::get_instance()->get_description($this->get_organization_id());
                                }
                        }