diff options
author | diosmosis <diosmosis@users.noreply.github.com> | 2019-01-04 09:34:37 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-04 09:34:37 +0300 |
commit | e92247972a99092eb300bcbc163492542017d1b5 (patch) | |
tree | 96396004aab1e2e7010c31388707a99b66d78a90 /core/Mail.php | |
parent | 8e499448926af8870aa6f011128ba4031e4cfcb8 (diff) |
Make sure all Matomo emails use correct branding. (#13908)
* Make sure all Matomo emails use correct branding.
* update email logo
* reuse variables
* Change default from to Matomo Analytics.
* Fix list style in report emails, update customalerts submodule and make dashboard link got to default erport in emails.
* Updated submodule.
* Bump version + update submodules.
* Remove submodule update so plugins can be merged after rc2 merged.
Diffstat (limited to 'core/Mail.php')
-rw-r--r-- | core/Mail.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/Mail.php b/core/Mail.php index 28ac1e454a..55119ca93b 100644 --- a/core/Mail.php +++ b/core/Mail.php @@ -47,14 +47,18 @@ class Mail extends Zend_Mail if (empty($fromEmailName) && $customLogo->isEnabled()) { $fromEmailName = $translator->translate('CoreHome_WebAnalyticsReports'); } elseif (empty($fromEmailName)) { - $fromEmailName = $translator->translate('ScheduledReports_PiwikReports'); + $fromEmailName = $translator->translate('TagManager_MatomoTagName'); } $fromEmailAddress = Config::getInstance()->General['noreply_email_address']; $this->setFrom($fromEmailAddress, $fromEmailName); } - public function setWrappedHtmlBody(View $body) + /** + * @param View|string $body + * @throws \DI\NotFoundException + */ + public function setWrappedHtmlBody($body) { $contentGenerator = StaticContainer::get(ContentGenerator::class); $bodyHtml = $contentGenerator->generateHtmlContent($body); |