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

[sigurdne]

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

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

Modified: branches/dev-syncromind-2/property/inc/class.uigeneric.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uigeneric.inc.php      
2016-05-13 12:06:56 UTC (rev 15085)
+++ branches/dev-syncromind-2/property/inc/class.uigeneric.inc.php      
2016-05-13 12:06:59 UTC (rev 15086)
@@ -474,6 +474,7 @@
                        $order = phpgw::get_var('order');
                        $draw = phpgw::get_var('draw', 'int');
                        $columns = phpgw::get_var('columns');
+                       $export = phpgw::get_var('export', 'bool');
 
                        $params = array(
                                'start' => phpgw::get_var('start', 'int', 
'REQUEST', 0),
@@ -483,7 +484,7 @@
                                'sort' => $order[0]['dir'],
                                'dir' => $order[0]['dir'],
                                'cat_id' => phpgw::get_var('cat_id', 'int', 
'REQUEST', 0),
-                               'allrows' => phpgw::get_var('length', 'int') == 
-1
+                               'allrows' => phpgw::get_var('length', 'int') == 
-1 || $export,
                        );
 
                        foreach ($this->location_info['fields'] as $field)
@@ -498,7 +499,7 @@
                        $result_count = 0;
 
                        $values = $this->bo->read($params);
-                       if (phpgw::get_var('export', 'bool'))
+                       if ($export)
                        {
                                return $values;
                        }