From 27dbbbb660b5a3b50ebce0ddeeb9fcb1f0cd5ccb Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Mon, 9 Sep 2024 17:49:53 -0400
Subject: [PATCH] Fixed Bulk Merge issues by renaming ticket_id name var in
 bulk merge modal

---
 ticket_bulk_merge_modal.php | 2 +-
 tickets.php                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ticket_bulk_merge_modal.php b/ticket_bulk_merge_modal.php
index 572f6207..3d483672 100644
--- a/ticket_bulk_merge_modal.php
+++ b/ticket_bulk_merge_modal.php
@@ -8,7 +8,7 @@
                 </button>
             </div>
 
-            <input type="hidden" id="current_ticket_id" name="ticket_id" value="0"> <!-- Can't currently bulk check this -->
+            <input type="hidden" id="current_ticket_id" name="current_ticket_id" value="0"> <!-- Can't currently bulk check this -->
             <input type="hidden" name="merge_move_replies" value="0"> <!-- Default 0 -->
             <div class="modal-body bg-white">
 
diff --git a/tickets.php b/tickets.php
index 02ade7a6..69b5836b 100644
--- a/tickets.php
+++ b/tickets.php
@@ -550,7 +550,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
                 <?php require_once "ticket_bulk_edit_priority_modal.php"; ?>
                 <?php require_once "ticket_bulk_add_project_modal.php"; ?>
                 <?php require_once "ticket_bulk_reply_modal.php"; ?>
-                <?php // 2024-08-25 JQ Disabled not able to change assignee require_once "ticket_bulk_merge_modal.php"; ?>
+                <?php require_once "ticket_bulk_merge_modal.php"; //2024-08-25 JQ Disabled not able to change assignee ?>
                 <?php require_once "ticket_bulk_resolve_modal.php"; ?>
             </form>
             <?php require_once "pagination.php"; ?>