Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@gmail.com>2015-07-29 11:48:32 +0300
committerThomas Steur <thomas.steur@gmail.com>2015-07-29 11:48:32 +0300
commitc5fab31c28b602b9dfcbd40fbf8ac1aab249681c (patch)
treed10f2bc4afa267a5f9ac9f833ac0db888ddf0944 /core/Mail.php
parent08fa53b99fa94ad51112288487c6bcb950474dfa (diff)
refs #8252 introduce new option noreply_email_name
Diffstat (limited to 'core/Mail.php')
-rw-r--r--core/Mail.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/Mail.php b/core/Mail.php
index b44e01c341..22843b5a76 100644
--- a/core/Mail.php
+++ b/core/Mail.php
@@ -40,9 +40,11 @@ class Mail extends Zend_Mail
/** @var Translator $translator */
$translator = StaticContainer::get('Piwik\Translation\Translator');
- if ($customLogo->isEnabled()) {
+ $fromEmailName = Config::getInstance()->General['noreply_email_name'];
+
+ if (empty($fromEmailName) && $customLogo->isEnabled()) {
$fromEmailName = $translator->translate('CoreHome_WebAnalyticsReports');
- } else {
+ } elseif (empty($fromEmailName)) {
$fromEmailName = $translator->translate('ScheduledReports_PiwikReports');
}