fix(form): search criteria when using keywords

Fix wrongly constructed query in case of keywords being used. It caused that also forms which should not be visible where shown.
pluginsGLPI · May 24, 2022 · 23ab7a3 · 23ab7a3
1 parent 2e18634
commit 23ab7a3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/inc/form.class.php b/inc/form.class.php
@@ -748,7 +748,7 @@ public static function getFormList(int $rootCategory = 0, string $keywords = '',
          // Searching for all forms without category restriction
          $onlyDefault = PluginFormcreatorEntityconfig::getUsedConfig('default_form_list_mode', Session::getActiveEntity());
          if ($onlyDefault == PluginFormcreatorEntityconfig::CONFIG_DEFAULT_FORM_LIST_DEFAULT) {
-            $where_form['WHERE']['is_default'] = 1;
+            $where_form['WHERE']['AND']['is_default'] = 1;
          }
       }
 
@@ -768,7 +768,7 @@ public static function getFormList(int $rootCategory = 0, string $keywords = '',
       $keywords = trim($keywords);
       if (!empty($keywords)) {
          $keywordsWithWilcards = $DB->escape(PluginFormcreatorCommon::prepareBooleanKeywords($keywords));
-         $where_form['AND'][] = [
+         $where_form['WHERE']['AND'][] = [
             'OR' => [
                new QueryExpression("MATCH($table_form.`name`, $table_form.`description`)
                   AGAINST('$keywordsWithWilcards' IN BOOLEAN MODE)"),