Skip to content

Commit 7e08d15

Browse files
author
Oleksandr Iegorov
committed
MAGETWO-66793: [Backport] Merchant can't unsubscribe Customer from Newsletter in Admin
1 parent 86ad99f commit 7e08d15

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

app/code/Magento/Newsletter/Model/Subscriber.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use Magento\Framework\App\ObjectManager;
1111
use Magento\Framework\Exception\MailException;
1212
use Magento\Framework\Exception\NoSuchEntityException;
13-
use Magento\Framework\Stdlib\DateTime\DateTime;
1413

1514
/**
1615
* Subscriber model
@@ -96,7 +95,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
9695
/**
9796
* Date
9897
*
99-
* @var DateTime
98+
* @var \Magento\Framework\Stdlib\DateTime\DateTime
10099
*/
101100
private $dateTime;
102101

@@ -143,7 +142,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
143142
* @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
144143
* @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
145144
* @param array $data
146-
* @param DateTime|null $dateTime
145+
* @param \Magento\Framework\Stdlib\DateTime\DateTime|null $dateTime
147146
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
148147
*/
149148
public function __construct(
@@ -160,7 +159,7 @@ public function __construct(
160159
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
161160
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
162161
array $data = [],
163-
DateTime $dateTime = null
162+
\Magento\Framework\Stdlib\DateTime\DateTime $dateTime = null
164163
) {
165164
$this->_newsletterData = $newsletterData;
166165
$this->_scopeConfig = $scopeConfig;
@@ -170,7 +169,8 @@ public function __construct(
170169
$this->customerRepository = $customerRepository;
171170
$this->customerAccountManagement = $customerAccountManagement;
172171
$this->inlineTranslation = $inlineTranslation;
173-
$this->dateTime = $dateTime ?: ObjectManager::getInstance()->get(DateTime::class);
172+
$this->dateTime = $dateTime
173+
?: ObjectManager::getInstance()->get(\Magento\Framework\Stdlib\DateTime\DateTime::class);
174174
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
175175
}
176176

0 commit comments

Comments
 (0)