From b11eebd277ff262a99ced69d91aebed52166defd Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 30 Dec 2021 16:18:36 -0500
Subject: [PATCH] Message: Update tags from inbox - refs BT#19396

---
 main/inc/ajax/message.ajax.php         | 2 +-
 main/inc/lib/extra_field_value.lib.php | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/main/inc/ajax/message.ajax.php b/main/inc/ajax/message.ajax.php
index 0baa81e3fb..bdc222d9d3 100755
--- a/main/inc/ajax/message.ajax.php
+++ b/main/inc/ajax/message.ajax.php
@@ -159,7 +159,7 @@ switch ($action) {
                 'extra_tags' => $tagList,
             ];
 
-            $extraFieldValues->saveFieldValues($extraParams);
+            $extraFieldValues->saveFieldValues($extraParams, false, false, ['tags'], [], false, false);
         }
         break;
     default:
diff --git a/main/inc/lib/extra_field_value.lib.php b/main/inc/lib/extra_field_value.lib.php
index c31901c59e..6d9b3d66b0 100755
--- a/main/inc/lib/extra_field_value.lib.php
+++ b/main/inc/lib/extra_field_value.lib.php
@@ -93,7 +93,8 @@ class ExtraFieldValue extends Model
         $showQuery = false,
         $saveOnlyThisFields = [],
         $avoidFields = [],
-        $forceSave = false
+        $forceSave = false,
+        $deleteOldValues = true
     ) {
         foreach ($params as $key => $value) {
             $found = strpos($key, '__persist__');
@@ -208,8 +209,10 @@ class ExtraFieldValue extends Model
                             'itemId' => $params['item_id'],
                         ]);
 
-                    foreach ($currentTags as $extraFieldtag) {
-                        $em->remove($extraFieldtag);
+                    if ($deleteOldValues) {
+                        foreach ($currentTags as $extraFieldtag) {
+                            $em->remove($extraFieldtag);
+                        }
                     }
                     $em->flush();
                     $tagValues = is_array($value) ? $value : [$value];