@@ -91,7 +91,6 @@ public static function getCategoryTree(): array {
91
91
92
92
$ cat_table = PluginFormcreatorCategory::getTable ();
93
93
$ form_table = PluginFormcreatorForm::getTable ();
94
- $ table_fp = PluginFormcreatorForm_Profile::getTable ();
95
94
96
95
if (version_compare (GLPI_VERSION , '10.0.6 ' ) > 0 ) {
97
96
$ knowbase_category = KnowbaseItemCategory::SEEALL ;
@@ -104,9 +103,7 @@ public static function getCategoryTree(): array {
104
103
'contains ' => '' ,
105
104
'knowbaseitemcategories_id ' => $ knowbase_category ,
106
105
]);
107
- // GLPI 9.5 returns an array
108
- $ subQuery = new DBMysqlIterator ($ DB );
109
- $ subQuery ->buildQuery ($ query_faqs );
106
+ $ query_faqs ['SELECT ' ] = [$ query_faqs ['FROM ' ] . '. ' . 'id ' ];
110
107
111
108
$ dbUtils = new DbUtils ();
112
109
$ entityRestrict = $ dbUtils ->getEntitiesRestrictCriteria ($ form_table , "" , "" , true , false );
@@ -120,18 +117,15 @@ public static function getCategoryTree(): array {
120
117
// Get base query, add count and category condition
121
118
$ count_forms_criteria = PluginFormcreatorForm::getFormListQuery ();
122
119
$ count_forms_criteria ['COUNT ' ] = 'count ' ;
123
- $ count_forms_criteria ['WHERE ' ]["$ form_table. $ categoryFk " ] = new QueryExpression ("$ cat_table.id " );
120
+ $ count_forms_criteria ['WHERE ' ]["` $ form_table`.` $ categoryFk` " ] = new QueryExpression ("` $ cat_table`.`id` " );
124
121
125
122
$ count1 = new QuerySubQuery ($ count_forms_criteria );
126
123
$ count2 = new QuerySubQuery ([
127
124
'COUNT ' => 'count ' ,
128
125
'FROM ' => 'glpi_knowbaseitems_knowbaseitemcategories ' ,
129
126
'WHERE ' => [
130
- 'knowbaseitems_id ' => new QuerySubQuery ([
131
- 'SELECT ' => 'faqs.id ' ,
132
- 'FROM ' => (new QuerySubQuery ($ query_faqs , 'faqs ' ))
133
- ]),
134
- [(new QueryExpression ("knowbaseitemcategories_id = $ cat_table.knowbaseitemcategories_id " ))],
127
+ 'knowbaseitems_id ' => new QuerySubQuery ($ query_faqs ),
128
+ [(new QueryExpression ("`glpi_knowbaseitems_knowbaseitemcategories`.`knowbaseitemcategories_id` = ` $ cat_table`.`knowbaseitemcategories_id` " ))],
135
129
]
136
130
]);
137
131
$ request = [
0 commit comments