From e86bc5bcf1bf217414db499c9805acc23e3e2b3c Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Wed, 21 Oct 2015 21:14:31 -0500
Subject: [PATCH] queue: oops: Fix regression adding extra fields to adhoc
search
---
include/ajax.search.php | 3 +--
include/class.search.php | 3 ---
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/include/ajax.search.php b/include/ajax.search.php
index f0933380e..5ef597a55 100644
--- a/include/ajax.search.php
+++ b/include/ajax.search.php
@@ -63,7 +63,7 @@ class SearchAjaxAPI extends AjaxController {
$search = SavedSearch::create(array('root'=>'T'));
$searchable = $search->getSupportedMatches();
if (!($F = $searchable[$name]))
- Http::response(404, 'No such field: ', print_r($id, true));
+ Http::response(404, 'No such field: ', print_r($name, true));
$fields = SavedSearch::getSearchField($F, $name);
$form = new AdvancedSearchForm($fields);
@@ -101,7 +101,6 @@ class SearchAjaxAPI extends AjaxController {
}
function _setupSearch(SavedSearch $search, $form, $key='advsearch') {
- $form = $search->getForm($vars);
if ($this->_hasErrors($search, $form))
return false;
diff --git a/include/class.search.php b/include/class.search.php
index 1597b063f..c89234029 100644
--- a/include/class.search.php
+++ b/include/class.search.php
@@ -769,9 +769,6 @@ class SavedSearch extends VerySimpleModel {
$fields = array_merge($fields, self::getSearchField($field, $path));
}
- // Don't send the state as the souce because it is not in the
- // ::parse format (it's in ::to_php format). Instead, source is set
- // via ::loadState() below
$form = new AdvancedSearchForm($fields, $source);
$form->addValidator(function($form) {
$selected = 0;
--
GitLab