fix: compatibility with GLPI 9.5

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Nov 1, 2019 · f818178 · f818178
1 parent 6eb2bb8
commit f818178
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/inc/category.class.php b/inc/category.class.php
@@ -92,6 +92,12 @@ public static function getCategoryTree($rootId = 0, $helpdeskHome = false) {
          'faq'      => '1',
          'contains' => ''
       ]);
+      if (version_compare(GLPI_VERSION, "9.4") > 0) {
+         // GLPI 9.5 returns an array
+         $subQuery = new DBMysqlIterator($DB);
+         $subQuery->buildQuery($query_faqs);
+         $query_faqs = $subQuery->getSQL();
+      }
 
       // Selects categories containing forms or sub-categories
       $categoryFk = self::getForeignKeyField();

diff --git a/inc/form.class.php b/inc/form.class.php
@@ -907,13 +907,19 @@ public function showFormList($rootCategory = 0, $keywords = '', $helpdeskHome =
       }
 
       // Find FAQ entries
-      $query_faqs = new QueryExpression('(' . KnowbaseItem::getListRequest([
-            'faq'      => '1',
-            'contains' => $keywords
-      ]) . ') AS `faqs`');
+      $query_faqs = KnowbaseItem::getListRequest([
+         'faq'      => '1',
+         'contains' => $keywords
+      ]);
+      if (version_compare(GLPI_VERSION, "9.4") > 0) {
+         $subQuery = new DBMysqlIterator($DB);
+         $subQuery->buildQuery($query_faqs);
+         $query_faqs = '(' . $subQuery->getSQL() . ') AS `faqs`';
+      }
+
       $query_faqs = [
          'SELECT' => ['faqs' => '*'],
-         'FROM' => $query_faqs,
+         'FROM' => new QueryExpression('(' . $query_faqs . ') AS `faqs`'),
       ];
       if (count($selectedCategories) > 0) {
          $query_faqs['WHERE'] = [