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

[sigurdne]

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

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

Modified: branches/dev-syncromind-2/property/inc/class.uiproject.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uiproject.inc.php      
2016-05-13 12:07:16 UTC (rev 15092)
+++ branches/dev-syncromind-2/property/inc/class.uiproject.inc.php      
2016-05-13 12:07:19 UTC (rev 15093)
@@ -647,6 +647,7 @@
                        $start_date = urldecode(phpgw::get_var('start_date'));
                        $end_date = urldecode(phpgw::get_var('end_date'));
                        $skip_origin = phpgw::get_var('skip_origin', 'bool');
+                       $export = phpgw::get_var('export', 'bool');
 
                        if ($start_date && empty($end_date))
                        {
@@ -660,7 +661,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,
                                'start_date' => $start_date,
                                'end_date' => $end_date,
                                'skip_origin' => $skip_origin
@@ -668,7 +669,7 @@
 
                        $values = $this->bo->read($params);
 
-                       if (phpgw::get_var('export', 'bool'))
+                       if ($export)
                        {
                                return $values;
                        }