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

[sigurdne]

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

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

Modified: branches/dev-syncromind-2/property/inc/class.uidocument2.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uidocument2.inc.php    
2016-05-13 12:06:42 UTC (rev 15080)
+++ branches/dev-syncromind-2/property/inc/class.uidocument2.inc.php    
2016-05-13 12:06:45 UTC (rev 15081)
@@ -283,6 +283,7 @@
                        $draw = phpgw::get_var('draw', 'int');
 
                        $columns = $this->_get_columns();
+                       $export = phpgw::get_var('export', 'bool');
 
 
                        $params = array
@@ -292,12 +293,12 @@
                                'query' => $search['value'],
                                'order' => $order,
                                '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,
                        );
 
                        $values = $this->bo->read2(array('columns' => $columns, 
'params' => $params));
 
-                       if (phpgw::get_var('export', 'bool'))
+                       if ($export)
                        {
                                return $values;
                        }