From c93b433b93ee71f7a72811317a16065d8159a39e Mon Sep 17 00:00:00 2001
From: David Remer <webmaster@websupporter.net>
Date: Tue, 12 Sep 2023 13:35:59 +0300
Subject: [PATCH] Fire mailpoet_subscriber_tag_added hook after flush()

[MAILPOET-5515]
---
 mailpoet/lib/Subscribers/SubscriberSaveController.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mailpoet/lib/Subscribers/SubscriberSaveController.php b/mailpoet/lib/Subscribers/SubscriberSaveController.php
index 168c2f4c2f..7c2f9ea1be 100644
--- a/mailpoet/lib/Subscribers/SubscriberSaveController.php
+++ b/mailpoet/lib/Subscribers/SubscriberSaveController.php
@@ -311,6 +311,7 @@ class SubscriberSaveController {
       }
     }
 
+    $newlyAddedTags = [];
     foreach ($data['tags'] as $tagName) {
       $tag = $this->tagRepository->createOrUpdate(['name' => $tagName]);
       $subscriberTag = $subscriber->getSubscriberTag($tag);
@@ -318,9 +319,12 @@ class SubscriberSaveController {
         $subscriberTag = new SubscriberTagEntity($tag, $subscriber);
         $subscriber->getSubscriberTags()->add($subscriberTag);
         $this->subscriberTagRepository->persist($subscriberTag);
-        $this->wp->doAction('mailpoet_subscriber_tag_added', $subscriberTag);
+        $newlyAddedTags[] = $subscriberTag;
       }
     }
     $this->subscriberTagRepository->flush();
+    foreach ($newlyAddedTags as $subscriberTag) {
+      $this->wp->doAction('mailpoet_subscriber_tag_added', $subscriberTag);
+    }
   }
 }