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

11
lib/Config/Shortcodes.php
View File

@ -8,6 +8,7 @@ use MailPoet\Models\Newsletter;
use MailPoet\Models\Subscriber;
use MailPoet\Newsletter\Url as NewsletterUrl;
use MailPoet\Segments\SegmentSubscribersRepository;
use MailPoet\Subscribers\SubscribersRepository;
use MailPoet\Subscription\Pages;
use MailPoet\WP\Functions as WPFunctions;
@ -21,14 +22,19 @@ class Shortcodes {
/** @var SegmentSubscribersRepository */
private $segmentSubscribersRepository;
/** @var SubscribersRepository */
private $subscribersRepository;
public function __construct(
Pages $subscriptionPages,
WPFunctions $wp,
SegmentSubscribersRepository $segmentSubscribersRepository
SegmentSubscribersRepository $segmentSubscribersRepository,
SubscribersRepository $subscribersRepository
) {
$this->subscriptionPages = $subscriptionPages;
$this->wp = $wp;
$this->segmentSubscribersRepository = $segmentSubscribersRepository;
$this->subscribersRepository = $subscribersRepository;
}
public function init() {
@ -101,7 +107,8 @@ class Shortcodes {
$newsletters = Newsletter::getArchives($segmentIds);
$subscriber = Subscriber::getCurrentWPUser();
$subscriber = $this->subscribersRepository->getCurrentWPUser();
$subscriber = $subscriber ? Subscriber::findOne($subscriber->getId()) : null;
if (empty($newsletters)) {
return $this->wp->applyFilters(