Fixed the resending Newsletter confirmation issue

magento · Aug 13, 2020 · 1a7c8cd · 1a7c8cd
1 parent a360c06
commit 1a7c8cd
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/code/Magento/Newsletter/Model/SubscriptionManager.php b/app/code/Magento/Newsletter/Model/SubscriptionManager.php
@@ -200,6 +200,7 @@ private function saveSubscriber(
             && (int)$subscriber->getCustomerId() === (int)$customer->getId()
             && (int)$subscriber->getStoreId() === $storeId
             && !$emailChanged
+            && $status !== Subscriber::STATUS_NOT_ACTIVE
         ) {
             return false;
         }
@@ -220,10 +221,10 @@ private function saveSubscriber(
 
         /**
          * If the subscriber is waiting to confirm from the customer
-         * and customer changed the email
+         * or customer changed the email
          * than need to send confirmation letter to the new email
          */
-        return $status === Subscriber::STATUS_NOT_ACTIVE && $emailChanged;
+        return $status === Subscriber::STATUS_NOT_ACTIVE || $emailChanged;
     }
 
     /**