[Fmsystem-commits] [15153] Syncromind: Merge 14936:15027 from trunk

[sigurdne]

Revision: 15153
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15153
Author:   sigurdne
Date:     2016-05-13 12:25:57 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk

Modified Paths:
--------------
    branches/dev-syncromind-2/rental/inc/model/class.party.inc.php

Modified: branches/dev-syncromind-2/rental/inc/model/class.party.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/model/class.party.inc.php      
2016-05-13 12:25:54 UTC (rev 15152)
+++ branches/dev-syncromind-2/rental/inc/model/class.party.inc.php      
2016-05-13 12:25:57 UTC (rev 15153)
@@ -438,7 +438,7 @@
                        }
 
                        $location_name = 
$GLOBALS['phpgw']->locations->get_name($this->location_id);
-                       $result_unit_number = 
result_unit::get_identifier_from_name($location_name['location']);
+                       $result_unit_number = 
result_unit::get_identifier_from_name((string)$location_name['location']);
 
                        return array(
                                'id' => $this->id,