diff --git a/agent/post/ticket.php b/agent/post/ticket.php index 422f7113..4f17790d 100644 --- a/agent/post/ticket.php +++ b/agent/post/ticket.php @@ -1814,14 +1814,19 @@ if (isset($_POST['merge_ticket'])) { // NEW PARENT ticket details // Get merge into ticket id (as it may differ from the number) - $sql = mysqli_query($mysqli, "SELECT ticket_id FROM tickets WHERE ticket_number = $merge_into_ticket_number"); + $sql = mysqli_query($mysqli, "SELECT ticket_id, ticket_client_id FROM tickets WHERE ticket_number = $merge_into_ticket_number"); if (mysqli_num_rows($sql) == 0) { flash_alert("Cannot merge into that ticket.", 'error'); redirect(); } $merge_row = mysqli_fetch_array($sql); $merge_into_ticket_id = intval($merge_row['ticket_id']); - + $client_id = intval($merge_row['ticket_client_id']); + if ($client_id) { + $has_client = "&client_id=$client_id"; + } else { + $has_client = ""; + } // Sanity check if ($ticket_number == $merge_into_ticket_number) { flash_alert("Cannot merge into the same ticket.", 'error'); @@ -1853,7 +1858,7 @@ if (isset($_POST['merge_ticket'])) { flash_alert("Ticket merged into $ticket_prefix$merge_into_ticket_number"); - redirect(); + redirect("ticket.php?ticket_id=$merge_into_ticket_id$has_client"); }