Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Use getCurrentWPUser from SubscribersRepository

Browse Source 
[MAILPOET-3268]
This commit is contained in:
Jan Lysý
2021-03-10 08:34:28 +01:00
committed by Veljko V
parent 97dd881e8d
commit dffaab10a2
6 changed files with 68 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Newsletter/Preview/SendPreviewController.php
View File

@ -6,7 +6,6 @@ use MailPoet\Entities\NewsletterEntity;
use MailPoet\Entities\SubscriberEntity;
use MailPoet\Mailer\Mailer;
use MailPoet\Mailer\MetaInfo;
use MailPoet\Models\Subscriber;
use MailPoet\Newsletter\Renderer\Renderer;
use MailPoet\Newsletter\Shortcodes\Shortcodes;
use MailPoet\Subscribers\SubscribersRepository;
@ -57,10 +56,7 @@ class SendPreviewController {
$body = implode($divider, $dataForShortcodes);
$subscriber = Subscriber::getCurrentWPUser();
if ($subscriber instanceof Subscriber) {
$subscriber = $this->subscribersRepository->findOneById($subscriber->id);
}
$subscriber = $this->subscribersRepository->getCurrentWPUser();
$this->shortcodes->setNewsletter($newsletter);
if ($subscriber instanceof SubscriberEntity) {
$this->shortcodes->setSubscriber($subscriber);