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

[sigurdne]

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

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

Modified: branches/dev-syncromind-2/property/inc/class.uigab.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uigab.inc.php  2016-05-13 
12:06:51 UTC (rev 15083)
+++ branches/dev-syncromind-2/property/inc/class.uigab.inc.php  2016-05-13 
12:06:53 UTC (rev 15084)
@@ -400,6 +400,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),
@@ -407,7 +408,7 @@
                                'query' => $search['value'],
                                'order' => 
$columns[$order[0]['column']]['data'],
                                'sort' => $order[0]['dir'],
-                               'allrows' => phpgw::get_var('length', 'int') == 
-1,
+                               'allrows' => phpgw::get_var('length', 'int') == 
-1 || $export,
                                'location_code' => $location_code ? 
$location_code : $search['value'],
                                'gaards_nr' => $gaards_nr,
                                'bruksnr' => $bruksnr,
@@ -529,7 +530,7 @@
                        }
 
 
-                       if (phpgw::get_var('export', 'bool'))
+                       if ($export)
                        {
                                return $values;
                        }