[Fmsystem-commits] [12260] change read function

[Nelson Guerra]

Revision: 12260
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12260
Author:   nelson224
Date:     2014-11-03 23:05:29 +0000 (Mon, 03 Nov 2014)
Log Message:
-----------
change read function

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.bolocation.inc.php

Modified: branches/dev-syncromind/property/inc/class.bolocation.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.bolocation.inc.php       
2014-11-02 18:15:32 UTC (rev 12259)
+++ branches/dev-syncromind/property/inc/class.bolocation.inc.php       
2014-11-03 23:05:29 UTC (rev 12260)
@@ -724,7 +724,7 @@
                function read($data = array())
                {
 //_debug_array($data);
-                       $type_id = isset($data['type_id']) && $data['type_id'] 
? $data['type_id'] : $this->type_id;
+                       /*$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,
@@ -734,7 +734,9 @@
                                
'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'],'control_registered' => $data['control_registered'],
-                                        'control_id' => $data['control_id']));
+                                        'control_id' => 
$data['control_id']));*/
+                       
+                       $locations = $this->so->read($data);
 
                        $this->total_records = $this->so->total_records;
                        $this->uicols = $this->so->uicols;