From 18adb5796a139a7161ae634bf10bf4a0001d67bc Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 7 Dec 2025 20:40:00 +0000 Subject: [PATCH 1/3] Initial plan From 785d94eefd00cdbbdca3df3003eee51d4dfc91f5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 7 Dec 2025 20:52:25 +0000 Subject: [PATCH 2/3] Fix: Allow resubscription when user subscribes their own already-subscribed email Co-authored-by: addison74 <8360474+addison74@users.noreply.github.com> --- app/code/core/Mage/Newsletter/Model/Subscriber.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/code/core/Mage/Newsletter/Model/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Subscriber.php index 3d08c29402e..ca83072d0dc 100644 --- a/app/code/core/Mage/Newsletter/Model/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Subscriber.php @@ -352,7 +352,12 @@ public function subscribe($email) $this->setSubscriberEmail($email); } elseif ($this->getStatus() == self::STATUS_SUBSCRIBED) { - Mage::throwException(Mage::helper('newsletter')->__('This email address is already registered.')); + // Allow resubscription if user is subscribing their own email + if (!$isSubscribeOwnEmail) { + Mage::throwException(Mage::helper('newsletter')->__('This email address is already registered.')); + } + // If user is resubscribing their own email that's already subscribed, just return success + return $this->getStatus(); } if ($isSubscribeOwnEmail) { From b0a972721a96dfffc43e52e5b890407d6ef83bb3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 7 Dec 2025 20:59:53 +0000 Subject: [PATCH 3/3] Improve comment to clarify early return reasoning Co-authored-by: addison74 <8360474+addison74@users.noreply.github.com> --- app/code/core/Mage/Newsletter/Model/Subscriber.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/core/Mage/Newsletter/Model/Subscriber.php b/app/code/core/Mage/Newsletter/Model/Subscriber.php index ca83072d0dc..32b9fd7c8d4 100644 --- a/app/code/core/Mage/Newsletter/Model/Subscriber.php +++ b/app/code/core/Mage/Newsletter/Model/Subscriber.php @@ -356,7 +356,8 @@ public function subscribe($email) if (!$isSubscribeOwnEmail) { Mage::throwException(Mage::helper('newsletter')->__('This email address is already registered.')); } - // If user is resubscribing their own email that's already subscribed, just return success + // User is resubscribing their own email that's already subscribed + // Return early to avoid unnecessary save() and duplicate confirmation emails return $this->getStatus(); }