diff --git a/inc/category.class.php b/inc/category.class.php index ce4f4f5c0..09bd2ad49 100644 --- a/inc/category.class.php +++ b/inc/category.class.php @@ -99,9 +99,14 @@ public static function getCategoryTree($rootId = 0, $helpdeskHome = false) { $query_faqs = $subQuery->getSQL(); } + $dbUtils = new DbUtils(); + $entityRestrict = $dbUtils->getEntitiesRestrictCriteria($form_table, "", "", true, false); + if (count($entityRestrict)) { + $entityRestrict = [$entityRestrict]; + } + // Selects categories containing forms or sub-categories $categoryFk = self::getForeignKeyField(); - $dbUtils = new DbUtils(); $count1 = new QuerySubQuery([ 'COUNT' => 'count', 'FROM' => $form_table, @@ -120,7 +125,7 @@ public static function getCategoryTree($rootId = 0, $helpdeskHome = false) { ] ] + ($helpdeskHome ? ['helpdesk_home' => '1']: []) - + [$dbUtils->getEntitiesRestrictCriteria($form_table, "", "", true, false)], + + $entityRestrict, ]); $count2 = new QuerySubQuery([ 'COUNT' => 'count',