diff --git a/admin/find_tickets.php b/admin/find_tickets.php index 7b0f9626..e9041ed8 100644 --- a/admin/find_tickets.php +++ b/admin/find_tickets.php @@ -39,6 +39,7 @@ define('HESK_PATH','../'); require(HESK_PATH . 'hesk_settings.inc.php'); require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/admin_functions.inc.php'); +require(HESK_PATH . 'inc/status_functions.inc.php'); hesk_load_database_functions(); hesk_session_start(); @@ -66,7 +67,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
-
+

@@ -99,7 +100,8 @@ LEFT(`message`, 400) AS `message`, `lastreplier`, `replierid`, `archive`, -`locked` +`locked`, +`merged` "; foreach ($hesk_settings['custom_fields'] as $k=>$v) diff --git a/inc/show_search_form.inc.php b/inc/show_search_form.inc.php index e0b35307..eeeaf5ab 100644 --- a/inc/show_search_form.inc.php +++ b/inc/show_search_form.inc.php @@ -41,7 +41,7 @@ if ( ! isset($status) ) //-- We don't want to check statuses that are considered "closed" foreach ($allStatuses as $row) { - if ($status['IsClosed'] == 1) { + if ($row['IsClosed'] == 1) { continue; }