From 4e5cab9949bbf7e9f2c386922eb10cc9e6769d4a Mon Sep 17 00:00:00 2001 From: aydreeihn <adriane@enhancesoft.com> Date: Mon, 9 Sep 2019 12:14:20 -0500 Subject: [PATCH] Don't Delete Child Threads If we choose to delete a child ticket during merging, we should still keep the child thread so that we have the merge indicator on the parent ticket to show us which threads belonged to the deleted child and which belong to the parent ticket. --- include/class.ticket.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/class.ticket.php b/include/class.ticket.php index 538250900..35cc24031 100644 --- a/include/class.ticket.php +++ b/include/class.ticket.php @@ -3465,8 +3465,8 @@ implements RestrictedAccess, Threadable, Searchable { $parent->setMergeType(3); $parent->save(); } - } - + } else + $t->delete(); $t->delete(); $this->logEvent('deleted'); -- GitLab