[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9316]
From: |
Erik Holm-Larsen |
Subject: |
[Fmsystem-commits] [9316] |
Date: |
Tue, 08 May 2012 11:29:44 +0000 |
Revision: 9316
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9316
Author: erikhl
Date: 2012-05-08 11:29:43 +0000 (Tue, 08 May 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-05-08 11:28:40 UTC
(rev 9315)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-05-08 11:29:43 UTC
(rev 9316)
@@ -743,15 +743,23 @@
foreach ($activities as &$activity)
{
- //$activity['organization_info'] =
$this->get_org_info($activity['organization_id']);
- //$activity['group_info']
= $this->get_group_info($activity['group_id']);
+ if($activity['group_id'] &&
$activity['group_id'] =! '' && $activity['group_id'] != 0)
+ {
+ $activity['group_info']
= $this->get_group_info($activity['group_id']);
+ $activity['organization_info'] =
$this->get_org_info($activity['group_info']['organization_id']);
+ }
+ else
+ {
+ $activity['organization_info'] =
$this->get_org_info($activity['organization_id']);
+ $activity['group_info']
= $this->get_group_info($activity['group_id']);
+ }
$activity['district_name'] = $soap
? $this->get_district_name($activity['district']) :
utf8_decode($this->get_district_name($activity['district']));
$activity['category_name'] = $soap
? $this->get_category_name($activity['category']) :
utf8_decode($this->get_category_name($activity['category']));
$activity['description'] =
$this->get_activity_description($activity['organization_id'],$activity['group_id']);
$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;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9316],
Erik Holm-Larsen <=