[Fmsystem-commits] [8874]

[Erik Holm-Larsen]

Revision: 8874
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8874
Author:   erikhl
Date:     2012-02-15 06:23:39 +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-14 22:45:42 UTC 
(rev 8873)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-02-15 06:23:39 UTC 
(rev 8874)
@@ -782,7 +782,8 @@
        function get_groups()
        {
                $groups = array();
-               $this->db->query("SELECT * FROM bb_group WHERE 
show_in_portal=1", __LINE__, __FILE__);
+               $join = " {$this->left_join} bb_organization ON 
(bb_group.organization_id = bb_organization.id)";
+               $this->db->query("SELECT bb_group.*, bb_organization.homepage 
FROM bb_group {$join} WHERE bb_group.show_in_portal=1", __LINE__, __FILE__);
                while($this->db->next_record())
                {
                        $groups[] = array
@@ -791,6 +792,7 @@
                                'name'                          => 
utf8_decode($this->db->f('name')),
                                'shortname'                     => 
utf8_decode($this->db->f('shortname')),
                                'description'           => 
utf8_decode($this->db->f('description')),
+                               'homepage'                      => 
utf8_decode($this->db->f('homepage')),
                                'organization_id'       => 
$this->db->f('organization_id')
                        );
                }