fix(category): fix SQL error

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Jun 25, 2020 · 3470b61 · 3470b61
1 parent 426a16b
commit 3470b61
Showing 1 changed file with 7 additions and 2 deletions.
diff --git 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',