From 52f3dd9ed22ca5b9ba6e2a42b5d8c8c6e4f769a2 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Thu, 7 Jul 2011 18:34:33 +0000 Subject: [PATCH] Use a different method of filtering out global categories --- admin/inc/class.admin_categories.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/inc/class.admin_categories.inc.php b/admin/inc/class.admin_categories.inc.php index d3d36c6d5a..1090e880b8 100644 --- a/admin/inc/class.admin_categories.inc.php +++ b/admin/inc/class.admin_categories.inc.php @@ -324,10 +324,10 @@ class admin_categories } if($query['col_filter']['app']) { - $globalcat = false; + $filter['appname'] = $query['col_filter']['app']; } $cats = new categories($filter['owner'],$query['appname']); - $globalcat = $globalcat && isset($GLOBALS['egw_info']['user']['apps']['admin']) ? 'all_no_acl' : $globalcat; // ignore acl only for admins + $globalcat = isset($GLOBALS['egw_info']['user']['apps']['admin']) ? 'all_no_acl' : $globalcat; // ignore acl only for admins $rows = $cats->return_sorted_array($query['start'],false,$query['search'],$query['sort'],$query['order'],$globalcat,$parent=0,true,$filter); $count = $cats->total_records; foreach($rows as $key => &$row)