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

Not include sensitive data in rendered subject

Browse Source 
[MAILPOET-826]
This commit is contained in:
Pavel Dohnal
2017-06-21 10:24:43 +01:00
parent fb059f585e
commit 27a734d005
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Cron/Workers/SendingQueue/SendingQueue.php
View File

@ -103,9 +103,6 @@ class SendingQueue {
$subscriber, $subscriber,
$queue $queue
); );
if(!$queue->newsletter_rendered_subject) {
$queue->newsletter_rendered_subject = $prepared_newsletters[0]['subject'];
}
// format subscriber name/address according to mailer settings // format subscriber name/address according to mailer settings
$prepared_subscribers[] = $this->mailer_task->prepareSubscriberForSending( $prepared_subscribers[] = $this->mailer_task->prepareSubscriberForSending(
$subscriber $subscriber

1
lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
View File

@ -85,6 +85,7 @@ class Newsletter {
// extract and save newsletter posts // extract and save newsletter posts
PostsTask::extractAndSave($rendered_newsletter, $newsletter); PostsTask::extractAndSave($rendered_newsletter, $newsletter);
// update queue with the rendered and pre-processed newsletter // update queue with the rendered and pre-processed newsletter
$queue->newsletter_rendered_subject = Shortcodes::process($newsletter->subject, $newsletter, null, $queue);
$queue->newsletter_rendered_body = $rendered_newsletter; $queue->newsletter_rendered_body = $rendered_newsletter;
$queue->save(); $queue->save();
return $newsletter; return $newsletter;