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

Add a lazy instantiation of Mailer in NewSubscriberNofiticationMailer

Browse Source 
[MAILPOET-1823]
This commit is contained in:
Rostislav Wolny
2019-02-25 10:58:48 +01:00
committed by M. Shull
parent ccc300cd80
commit 1868d1e45f
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Subscribers/NewSubscriberNotificationMailer.php
View File

@@ -3,6 +3,7 @@
namespace MailPoet\Subscribers;
use MailPoet\Config\Renderer;
use MailPoet\Mailer\Mailer;
use MailPoet\Models\Segment;
use MailPoet\Models\Subscriber;
use MailPoet\WP\Functions;
@@ -36,18 +37,14 @@ class NewSubscriberNotificationMailer {
} else {
$caching = !WP_DEBUG;
$debugging = WP_DEBUG;
$this->renderer = new Renderer($caching, $debugging);
$this->renderer = new Renderer($caching, $debugging);
}
if ($wordpress_functions) {
$this->wordpress_functions = $wordpress_functions;
} else {
$this->wordpress_functions = new Functions();
}
if ($mailer) {
$this->mailer = $mailer;
} else {
$this->mailer = new \MailPoet\Mailer\Mailer(false, $this->constructSenderEmail());
}
$this->mailer = $mailer;
$this->settings = new SettingsController();
}
@@ -63,8 +60,9 @@ class NewSubscriberNotificationMailer {
return;
}
try {
$this->mailer->getSenderNameAndAddress($this->constructSenderEmail());
$this->mailer->send($this->constructNewsletter($subscriber, $segments), $settings['address']);
$this->getMailer()->getSenderNameAndAddress($this->constructSenderEmail());
$this->getMailer()->send($this->constructNewsletter($subscriber, $segments), $settings['address']);
} catch (\Exception $e) {
if (WP_DEBUG) {
throw $e;
@@ -88,6 +86,16 @@ class NewSubscriberNotificationMailer {
return !(bool)$settings['enabled'];
}
/**
* @return Mailer
*/
private function getMailer() {
if (!$this->mailer) {
$this->mailer = new Mailer(false, $this->constructSenderEmail());
}
return $this->mailer;
}
private function constructSenderEmail() {
$url_parts = parse_url($this->wordpress_functions->homeUrl());
$site_name = strtolower($url_parts['host']);