diff --git a/inc/print_tickets.inc.php b/inc/print_tickets.inc.php index de70e6ae..c1f87798 100644 --- a/inc/print_tickets.inc.php +++ b/inc/print_tickets.inc.php @@ -118,17 +118,16 @@ $possible_status = array(); $results = hesk_dbQuery($statusSql); while ($row = $results->fetch_assoc()) { - array_push($possible_status, $row['ID']); + $possible_status[$row['ID']] = $row['ID']; $totalStatuses++; } $status = $possible_status; - // Process statuses unless overridden with "s_all" variable if ( ! hesk_GET('s_all') ) { foreach ($status as $k => $v) { - if (empty($_GET['s' . $k])) + if (empty($_GET['s' . $v])) { unset($status[$k]); } diff --git a/inc/show_search_form.inc.php b/inc/show_search_form.inc.php index f4a944cf..d9b5f985 100644 --- a/inc/show_search_form.inc.php +++ b/inc/show_search_form.inc.php @@ -132,7 +132,7 @@ $more2 = empty($_GET['more2']) ? 0 : 1; fetch_assoc()) + while ($row = hesk_dbFetchAssoc($statusRS)) { if ($rowCounter > 3) { diff --git a/inc/ticket_list.inc.php b/inc/ticket_list.inc.php index 762c6896..4c191dee 100644 --- a/inc/ticket_list.inc.php +++ b/inc/ticket_list.inc.php @@ -404,8 +404,9 @@ if ($total > 0) // Print ticket status if ( hesk_show_column('status') ) { - $statusName = hesk_dbFetchAssoc(hesk_dbQuery("SELECT `Key`, `TextColor` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE ID = ".$ticket['status'])); - $ticket['status']=''.$hesklang[$statusName['Key']].''; + $statusRS = hesk_dbQuery("SELECT `ID`, `TextColor` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE ID = ".$ticket['status']); + $statusName = hesk_dbFetchAssoc($statusRS); + $ticket['status']=''.mfh_getDisplayTextForStatusId($statusName['ID']).''; echo ''.$ticket['status'].' '; }