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

[sigurdne]

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

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

Modified: branches/dev-syncromind-2/property/inc/class.boadmin_location.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.boadmin_location.inc.php       
2016-05-13 12:05:53 UTC (rev 15063)
+++ branches/dev-syncromind-2/property/inc/class.boadmin_location.inc.php       
2016-05-13 12:05:56 UTC (rev 15064)
@@ -105,11 +105,9 @@
                        return $standard;
                }
 
-               function read_config()
+               function read_config($data = array())
                {
-                       $standard = $this->so->read_config(array('start' => 
$this->start, 'query' => $this->query,
-                               'sort' => $this->sort, 'order' => 
$this->order));
-
+                       $standard = $this->so->read_config($data);
                        $this->total_records = $this->so->total_records;
 
                        return $standard;