From 53d5c88c14c8dd6c1f7f6c4a9453858af3edab6f Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Mon, 23 Jan 2012 13:54:44 +0000 Subject: [PATCH] check, that a possible col_filter is not overwritten by possible customfield col filters --- resources/inc/class.resources_bo.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/inc/class.resources_bo.inc.php b/resources/inc/class.resources_bo.inc.php index 207a555ee9..5d016d54dc 100755 --- a/resources/inc/class.resources_bo.inc.php +++ b/resources/inc/class.resources_bo.inc.php @@ -101,7 +101,7 @@ class resources_bo $order_by = $query['order'] ? $query['order'].' '. $query['sort'] : ''; $start = (int)$query['start']; - $query['col_filter'] = $filter; + foreach ($filter as $k => $v) $query['col_filter'][$k] = $v; $this->so->get_rows($query, $rows, $readonlys); $nr = $this->so->total;