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

[sigurdne]

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

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

Modified: branches/dev-syncromind-2/property/inc/class.uitenant_claim.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uitenant_claim.inc.php 
2016-05-13 12:07:30 UTC (rev 15097)
+++ branches/dev-syncromind-2/property/inc/class.uitenant_claim.inc.php 
2016-05-13 12:07:33 UTC (rev 15098)
@@ -382,6 +382,7 @@
                        $district_id = phpgw::get_var('district_id', 'int');
                        $columns = phpgw::get_var('columns');
                        $project_id = isset($data['project_id']) && 
$data['project_id'] ? $data['project_id'] : phpgw::get_var('project_id');
+                       $export = phpgw::get_var('export', 'bool');
 
                        $params = array(
                                'start' => $this->start,
@@ -392,7 +393,7 @@
                                'user_id' => $this->user_id,
                                'status' => $this->status,
                                'cat_id' => $this->cat_id,
-                               'allrows' => phpgw::get_var('length', 'int') == 
-1,
+                               'allrows' => phpgw::get_var('length', 'int') == 
-1 || $export,
                                'project_id' => $project_id,
                                'district_id' => $district_id
                        );
@@ -401,7 +402,7 @@
                        $result_count = 0;
                        //
                        $values = $this->bo->read($params);
-                       if (phpgw::get_var('export', 'bool'))
+                       if ($export)
                        {
                                return $values;
                        }