[Fmsystem-commits] [9530] property

[Sigurd Nes]

Revision: 9530
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9530
Author:   sigurdne
Date:     2012-06-07 08:22:06 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
property

Modified Paths:
--------------
    trunk/property/inc/class.bolocation.inc.php

Modified: trunk/property/inc/class.bolocation.inc.php
===================================================================
--- trunk/property/inc/class.bolocation.inc.php 2012-06-07 07:34:05 UTC (rev 
9529)
+++ trunk/property/inc/class.bolocation.inc.php 2012-06-07 08:22:06 UTC (rev 
9530)
@@ -676,10 +676,13 @@
                function read($data = array())
                {
 //_debug_array($data);
+                       $type_id = isset($data['type_id']) && $data['type_id'] 
? $data['type_id'] : $this->type_id;
+                       $allrows = isset($data['allrows']) && $data['allrows'] 
? $data['allrows'] : $this->allrows;
+                       
                        $locations = $this->so->read(array('start' => 
$this->start,'query' => $this->query,'sort' => $this->sort,'order' => 
$this->order,
-                               'filter' => $this->filter,'cat_id' => 
$this->cat_id,'type_id' => $data['type_id'],
+                               'filter' => $this->filter,'cat_id' => 
$this->cat_id,'type_id' => $type_id,
                                
'lookup_tenant'=>$data['lookup_tenant'],'lookup'=>$data['lookup'],
-                               
'district_id'=>$this->district_id,'allrows'=>$data['allrows'],
+                               
'district_id'=>$this->district_id,'allrows'=>$allrows,
                                
'status'=>$this->status,'part_of_town_id'=>$this->part_of_town_id,'dry_run'=>$data['dry_run'],
                                'location_code' => $this->location_code, 
'filter_role_on_contact' => $data['filter_role_on_contact'], 'role_id' => 
$data['role_id'],
                                'results' => $data['results']));