[Fmsystem-commits] [8906] activitycalendar: enable soap

[Sigurd Nes]

Revision: 8906
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8906
Author:   sigurdne
Date:     2012-02-16 14:39:56 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
activitycalendar: enable soap

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-16 14:37:41 UTC 
(rev 8905)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2012-02-16 14:39:56 UTC 
(rev 8906)
@@ -689,8 +689,8 @@
                {
                                //$activity['organization_info']        = 
$this->get_org_info($activity['organization_id']);
                                //$activity['group_info']                       
= $this->get_group_info($activity['group_id']);
-                               $activity['district_name']              = 
utf8_decode($this->get_district_name($activity['district']));
-                               $activity['category_name']              = 
utf8_decode($this->get_category_name($activity['category']));
+                               $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']);