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

Fix rendering shortcodes in subject

Browse Source 
[MAILPOET-3333]
This commit is contained in:
Pavel Dohnal
2020-12-02 15:41:53 +01:00
committed by Veljko V
parent 3af2ffbbb4
commit 56d7cd1398
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Cron/Workers/SendingQueue/Tasks/Shortcodes.php
View File

@ -32,18 +32,24 @@ class Shortcodes {
}
if ($queue instanceof SendingQueueEntity) {
$shortcodes->setQueue($queue);
} else {
$shortcodes->setQueue(null);
}
if ($newsletter instanceof \MailPoet\Models\Newsletter && $newsletter->id) {
$newsletter = $newsletterRepository->findOneById($newsletter->id);
}
if ($newsletter instanceof NewsletterEntity) {
$shortcodes->setNewsletter($newsletter);
} else {
$shortcodes->setNewsletter(null);
}
if ($subscriber instanceof Subscriber && $subscriber->id) {
$subscriber = $subscribersRepository->findOneById($subscriber->id);
}
if ($subscriber instanceof SubscriberEntity) {
$shortcodes->setSubscriber($subscriber);
} else {
$shortcodes->setSubscriber(null);
}
return $shortcodes->replace($content, $contentSource);
}