diff options
author | mattab <matthieu.aubry@gmail.com> | 2014-03-11 16:03:28 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2014-03-11 16:03:28 +0400 |
commit | 3e247251744d6f6d4be2ab88c73b828340691565 (patch) | |
tree | 7dedfe20676fc450fd217f155afe087d92882fcc | |
parent | 298b1b8edf040149e91343c0ae48ae91471f511f (diff) |
Fix regression in password email recovery mail found thanks to Password reset screenshot tests
@diosmosis first win for password reset workflow test
Failed screenshot: http://builds-artifacts.piwik.org/ui-tests.master/1910.1/processed-ui-screenshots/Login_password_reset.png
-rw-r--r-- | core/Mail.php | 3 | ||||
-rw-r--r-- | plugins/ScheduledReports/ScheduledReports.php | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/Mail.php b/core/Mail.php index efff725415..1fc1faf780 100644 --- a/core/Mail.php +++ b/core/Mail.php @@ -29,10 +29,9 @@ class Mail extends Zend_Mail { parent::__construct($charset); $this->initSmtpTransport(); - $this->setDefaultFromAddress(); } - private function setDefaultFromAddress() + public function setDefaultFromPiwik() { $customLogo = new CustomLogo(); $fromEmailName = $customLogo->isEnabled() diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php index 38fa35fcf7..0cf5200176 100644 --- a/plugins/ScheduledReports/ScheduledReports.php +++ b/plugins/ScheduledReports/ScheduledReports.php @@ -273,6 +273,7 @@ class ScheduledReports extends \Piwik\Plugin $subject = Piwik::translate('General_Report') . ' ' . $reportTitle . " - " . $prettyDate; $mail = new Mail(); + $mail->setDefaultFromPiwik(); $mail->setSubject($subject); $attachmentName = $subject; |