[Fmsystem-commits] [8875]

[Erik Holm-Larsen]

Revision: 8875
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8875
Author:   erikhl
Date:     2012-02-15 06:29:07 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soactivity.inc.php

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2012-02-15 06:23:39 UTC 
(rev 8874)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-02-15 06:29:07 UTC 
(rev 8875)
@@ -684,25 +684,25 @@
                                $activity['arena_info']                 = 
$this->get_arena_info($activity['arena']);
                                $activity['contact_person']             = 
$this->get_contact_person($activity['organization_id'],$activity['group_id'],$activity['contact_person_1']);
                }
-//     _debug_array($activities);
+       _debug_array($activities);
                return $activities;
        }
        
        function get_contact_person($org_id, $group_id, $cont_pers)
        {
-               if($group_id && $cont_pers)
+               if($group_id)
                {
-                       $cont_pers = (int)$cont_pers;
+                       $group_id = (int)$group_id;
        //              $this->db->query("SELECT * FROM bb_group_contact WHERE 
id={$cont_pers}", __LINE__, __FILE__);
-                       $this->db->query("SELECT * FROM bb_group_contact WHERE 
id={$cont_pers}", __LINE__, __FILE__);
+                       $this->db->query("SELECT * FROM bb_group_contact WHERE 
group_id={$group_id} LIMIT 1", __LINE__, __FILE__);
                        while($this->db->next_record()){
                                $result = array('name' => 
utf8_decode($this->db->f('name')),'phone' => $this->db->f('phone'),'email' => 
$this->db->f('email'));
                        }
                }
-               else if($org_id && $cont_pers)
+               else if($org_id)
                {
-                       $cont_pers = (int)$cont_pers;
-                       $this->db->query("SELECT * FROM bb_organization_contact 
WHERE id={$cont_pers}", __LINE__, __FILE__);
+                       $org_id = (int)$org_id;
+                       $this->db->query("SELECT * FROM bb_organization_contact 
WHERE organization_id={$org_id} LIMIT 1", __LINE__, __FILE__);
                        while($this->db->next_record()){
                                $result = array('name' => 
utf8_decode($this->db->f('name')),'phone' => $this->db->f('phone'),'email' => 
$this->db->f('email'));
                        }