#327 Fix find_tickets page

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');
 <tr>
 <td>
 <div class="row" style="padding-top: 20px">
-    <div class="col-md-10 col-md-offset-1">
+    <div class="col-md-12">
         <div class="panel panel-default">
             <div class="panel-heading">
                 <h4><?php echo $hesklang['tickets_found']; ?> <span style="float: right; margin-top: -7px;"><a href="new_ticket.php" class="btn btn-success"><?php echo $hesklang['nti']; ?></a></span></h4>
@@ -99,7 +100,8 @@ LEFT(`message`, 400) AS `message`,
 `lastreplier`,
 `replierid`,
 `archive`,
-`locked`
+`locked`,
+`merged`
 ";
 
 foreach ($hesk_settings['custom_fields'] as $k=>$v)

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;
         }