Skip to content

Commit d4d66d7

Browse files
Merge remote-tracking branch '39752/fix-39751' into commpr_787643004
2 parents 8421140 + 4edad41 commit d4d66d7

File tree

2 files changed

+7
-8
lines changed
  • app/code/Magento/Newsletter/Controller/Subscriber
  • dev/tests/integration/testsuite/Magento/Newsletter/Controller/Subscriber

2 files changed

+7
-8
lines changed

‎app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?php
22
/**
3-
*
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
3+
* Copyright 2013 Adobe
4+
* All Rights Reserved.
65
*/
76
declare(strict_types=1);
87

@@ -173,7 +172,7 @@ public function execute()
173172
{
174173
if ($this->getRequest()->isPost()
175174
&& $this->getRequest()->getPost('email')
176-
&& $this->newsletterConfig->isActive()
175+
&& $this->newsletterConfig->isActive(ScopeInterface::SCOPE_STORE)
177176
) {
178177
$email = (string)$this->getRequest()->getPost('email');
179178

‎dev/tests/integration/testsuite/Magento/Newsletter/Controller/Subscriber/NewActionTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2020 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -90,7 +90,7 @@ public function testNewAction(string $email, string $expectedMessage): void
9090
}
9191

9292
/**
93-
* @magentoConfigFixture newsletter/general/active 1
93+
* @magentoConfigFixture current_store newsletter/general/active 1
9494
*
9595
* @return void
9696
*/
@@ -107,7 +107,7 @@ public function testNewActionWithSubscriptionConfigEnabled(): void
107107
}
108108

109109
/**
110-
* @magentoConfigFixture newsletter/general/active 0
110+
* @magentoConfigFixture current_store newsletter/general/active 0
111111
*
112112
* @return void
113113
*/

0 commit comments

Comments
 (0)