diff --git a/resources/inc/class.bo_acl.inc.php b/resources/inc/class.bo_acl.inc.php index ca9409ee7f..b519dafab4 100755 --- a/resources/inc/class.bo_acl.inc.php +++ b/resources/inc/class.bo_acl.inc.php @@ -59,7 +59,7 @@ class bo_acl } } $this->save_sessiondata(); - $this->cats = $this->egw_cats->return_sorted_array(0,False); + $this->cats = $this->egw_cats->return_sorted_array(0,false,'','','',true); } } @@ -73,7 +73,7 @@ class bo_acl */ function get_cats($perm_type) { - $cats = $this->egw_cats->return_sorted_array(0,true,'','','',true); + $cats = $this->egw_cats->return_sorted_array(0,false,'','','',true); while (list(,$cat) = @each($cats)) { if($this->is_permitted($cat['id'],$perm_type)) diff --git a/resources/inc/class.ui_resources.inc.php b/resources/inc/class.ui_resources.inc.php index 935ef30405..22c43f5880 100755 --- a/resources/inc/class.ui_resources.inc.php +++ b/resources/inc/class.ui_resources.inc.php @@ -102,7 +102,6 @@ class ui_resources $content['nm']['no_filter'] = False; $content['nm']['filter_label'] = 'Category'; $content['nm']['filter_help'] = lang('Select a category'); // is this used??? - $content['nm']['options-filter']= array(''=>lang('all categories'))+(array)$this->bo->acl->get_cats(EGW_ACL_READ); $content['nm']['no_filter2'] = true; $content['nm']['filter_no_lang'] = true; $content['nm']['no_cat'] = true; @@ -115,6 +114,7 @@ class ui_resources { $content['nm'] = $nm_session_data; } + $content['nm']['options-filter']= array(''=>lang('all categories'))+(array)$this->bo->acl->get_cats(EGW_ACL_READ); // check if user is permitted to add resources if(!$this->bo->acl->get_cats(EGW_ACL_ADD))