From db6441c3dba2ac782abfe75d1ac2626f73a63152 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 10 May 2015 20:54:42 -0400
Subject: [PATCH] Fixes #232 Show status of merged ticket on client-side view
 ticket

---
 ticket.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ticket.php b/ticket.php
index 069d8e14..8c0668ae 100644
--- a/ticket.php
+++ b/ticket.php
@@ -265,7 +265,7 @@ require_once(HESK_PATH . 'inc/header.inc.php');
                 </div>
                 <div class="col-md-2 col-md-offset-4 col-sm-12 close-ticket">
                     <p><?php
-                        $statusRS = hesk_dbQuery('SELECT `Closable` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `ID` = '.intval($ticket['status']));
+                        $statusRS = hesk_dbQuery('SELECT * FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `ID` = '.intval($ticket['status']));
                         $status = hesk_dbFetchAssoc($statusRS);
                         $isClosable = $status['Closable'] == 'yes' || $status['Closable'] == 'conly';
                         $random=rand(10000,99999);
@@ -299,7 +299,7 @@ require_once(HESK_PATH . 'inc/header.inc.php');
                     $repliesColumnWidth = 3;
                 }
                 echo '<div class="col-md-3 col-sm-12 ticket-cell"><p class="ticketPropertyTitle">'.$hesklang['status'].'</p>';
-                    $ticketStatusKey = $ticket['statusKey'];
+                    $ticketStatusKey = $status['ShortNameContentKey'];
                      echo '<p class="ticketPropertyText">'.$hesklang[$ticketStatusKey].'</p>';
                 echo '</div>';
                 echo '<div class="col-md-3 col-sm-12 ticket-cell"><p class="ticketPropertyTitle">'.$hesklang['last_replier'].'</p>