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

[sigurdne]

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

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

Modified: branches/dev-syncromind-2/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uiadmin_entity.inc.php 
2016-05-13 12:06:19 UTC (rev 15072)
+++ branches/dev-syncromind-2/property/inc/class.uiadmin_entity.inc.php 
2016-05-13 12:06:22 UTC (rev 15073)
@@ -265,13 +265,15 @@
                                        break;
                        }
 
+                       $export = phpgw::get_var('export', 'bool');
+
                        $params = array(
                                'start' => $this->start,
                                'results' => phpgw::get_var('length', 'int', 
'REQUEST', 0),
                                'query' => $search['value'],
                                'sort' => $order[0]['dir'],
                                'order' => 
$columns[$order[0]['column']]['data'],
-                               'allrows' => phpgw::get_var('length', 'int') == 
-1,
+                               'allrows' => phpgw::get_var('length', 'int') == 
-1 || $export,
                                'entity_id' => $entity_id,
                                'cat_id' => $cat_id
                        );
@@ -304,7 +306,7 @@
                                $new_values[] = $value;
                        }
 
-                       if (phpgw::get_var('export', 'bool'))
+                       if ($export)
                        {
                                return $new_values;
                        }