[Fmsystem-commits] [9917]

[Erik Holm-Larsen]

Revision: 9917
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9917
Author:   erikhl
Date:     2012-08-28 05:49:42 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------


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

Modified: trunk/activitycalendar/inc/model/class.organization.inc.php
===================================================================
--- trunk/activitycalendar/inc/model/class.organization.inc.php 2012-08-27 
20:59:37 UTC (rev 9916)
+++ trunk/activitycalendar/inc/model/class.organization.inc.php 2012-08-28 
05:49:42 UTC (rev 9917)
@@ -162,7 +162,7 @@
                                'id' => $this->get_id(),
                                'name' => $this->get_name(),
                                'organization_number' => 
$this->get_organization_number(),
-                               'district' => ($this->get_change_type() == 
"new" && 
$this->get_district())?$so_act->get_district_from_id($this->get_district()):$this->get_district(),
+                               'district' => (($this->get_change_type() == 
"new" || $this->get_change_type() == "change") && $this->get_district() && 
is_numeric($this->get_district()))?$so_act->get_district_from_id($this->get_district()):$this->get_district(),
                                'description' => $this->get_description(),
                                'homepage'      =>      $this->get_homepage(),
                                'email' =>      $this->get_email(),