Merge remote-tracking branch 'origin/support/2.13.0' into support/2.14.0

Author: btry

inc/category.class.php

@@ -124,20 +124,12 @@ public static function getCategoryTree(): array {
          $knowbase_category = 0;
       }
 
-      if (version_compare(GLPI_VERSION, '10.0.6') > 0) {
-         $knowbase_category = KnowbaseItemCategory::SEEALL;
-      } else {
-         $knowbase_category = 0;
-      }
-
       $query_faqs = KnowbaseItem::getListRequest([
          'faq'      => '1',
          'contains' => '',
          'knowbaseitemcategories_id' => $knowbase_category,
       ]);
-      // GLPI 9.5 returns an array
-      $subQuery = new DBMysqlIterator($DB);
-      $subQuery->buildQuery($query_faqs);
+      $query_faqs['SELECT'] = [$query_faqs['FROM'] . '.' . 'id'];
 
       $dbUtils = new DbUtils();
       $entityRestrict = $dbUtils->getEntitiesRestrictCriteria($form_table, "", "", true, false);
@@ -151,18 +143,15 @@ public static function getCategoryTree(): array {
       // Get base query, add count and category condition
       $count_forms_criteria = PluginFormcreatorForm::getFormListQuery();
       $count_forms_criteria['COUNT'] = 'count';
-      $count_forms_criteria['WHERE']["$form_table.$categoryFk"] = new QueryExpression("$cat_table.id");
+      $count_forms_criteria['WHERE']["`$form_table`.`$categoryFk`"] = new QueryExpression("`$cat_table`.`id`");
 
       $count1 = new QuerySubQuery($count_forms_criteria);
       $count2 = new QuerySubQuery([
          'COUNT' => 'count',
          'FROM' => 'glpi_knowbaseitems_knowbaseitemcategories',
          'WHERE' => [
-            'knowbaseitems_id' => new QuerySubQuery([
-               'SELECT' => 'faqs.id',
-               'FROM' => (new QuerySubQuery($query_faqs, 'faqs'))
-            ]),
-            [(new QueryExpression("knowbaseitemcategories_id = $cat_table.knowbaseitemcategories_id"))],
+            'knowbaseitems_id' => new QuerySubQuery($query_faqs),
+            [(new QueryExpression("`glpi_knowbaseitems_knowbaseitemcategories`.`knowbaseitemcategories_id` = `$cat_table`.`knowbaseitemcategories_id`"))],
          ]
       ]);
       $request = [