[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15078] Syncromind: Merge 14936:15027 from trunk
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15078] Syncromind: Merge 14936:15027 from trunk |
Date: |
Fri, 13 May 2016 12:06:36 +0000 (UTC) |
Revision: 15078
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15078
Author: sigurdne
Date: 2016-05-13 12:06:36 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk
Modified Paths:
--------------
branches/dev-syncromind-2/property/inc/class.uicondition_survey.inc.php
Modified:
branches/dev-syncromind-2/property/inc/class.uicondition_survey.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uicondition_survey.inc.php
2016-05-13 12:06:33 UTC (rev 15077)
+++ branches/dev-syncromind-2/property/inc/class.uicondition_survey.inc.php
2016-05-13 12:06:36 UTC (rev 15078)
@@ -287,8 +287,8 @@
$search = phpgw::get_var('search');
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
+ $export = phpgw::get_var('export', 'bool');
-
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
'results' => phpgw::get_var('length', 'int',
'REQUEST', 0),
@@ -296,14 +296,14 @@
'sort' => phpgw::get_var('sort'),
'dir' => phpgw::get_var('dir'),
'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
);
$result_objects = array();
$result_count = 0;
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15078] Syncromind: Merge 14936:15027 from trunk,
sigurdne <=