From c5fab31c28b602b9dfcbd40fbf8ac1aab249681c Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Wed, 29 Jul 2015 08:48:32 +0000
Subject: refs #8252 introduce new option noreply_email_name

---
 core/Mail.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'core/Mail.php')

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');
         }
 
-- 
cgit v1.2.3