From 90d369a72111d53e1ad8dc84b40c95e5aaf912e6 Mon Sep 17 00:00:00 2001 From: Rostislav Wolny Date: Mon, 11 Feb 2019 11:37:42 +0100 Subject: [PATCH] Fix fatal error with confirmation email sending thru MP API [MAILPOET-1801] --- lib/Subscribers/ConfirmationEmailMailer.php | 5 ++++- .../integration/Subscribers/ConfirmationEmailMailerTest.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/Subscribers/ConfirmationEmailMailer.php b/lib/Subscribers/ConfirmationEmailMailer.php index 6b3d2703f5..91de0b7cd3 100644 --- a/lib/Subscribers/ConfirmationEmailMailer.php +++ b/lib/Subscribers/ConfirmationEmailMailer.php @@ -18,6 +18,7 @@ class ConfirmationEmailMailer { /** @var WPFunctions */ private $wp; + /** @var SettingsController */ private $settings; @@ -28,7 +29,9 @@ class ConfirmationEmailMailer { if($mailer) { $this->mailer = $mailer; } - if(!$wp) { + if($wp) { + $this->wp = $wp; + } else { $this->wp = new WPFunctions; } $this->settings = new SettingsController(); diff --git a/tests/integration/Subscribers/ConfirmationEmailMailerTest.php b/tests/integration/Subscribers/ConfirmationEmailMailerTest.php index 90cafb798f..a13f889716 100644 --- a/tests/integration/Subscribers/ConfirmationEmailMailerTest.php +++ b/tests/integration/Subscribers/ConfirmationEmailMailerTest.php @@ -31,7 +31,7 @@ class ConfirmationEmailMailerTest extends \MailPoetTest { }), ], $this); - $sender = new ConfirmationEmailMailer($mailer); + $sender = new ConfirmationEmailMailer($mailer, new WPFunctions); $segment = Segment::createOrUpdate(