diff options
| author | mattpiwik <matthieu.aubry@gmail.com> | 2011-02-17 15:56:14 +0300 |
|---|---|---|
| committer | mattpiwik <matthieu.aubry@gmail.com> | 2011-02-17 15:56:14 +0300 |
| commit | 372096461c57f4d1129082aedad4b8fbc4e1389e (patch) | |
| tree | 5435b387cc1bb56cc43fe5b3609020d12f9e1b18 /core/Mail.php | |
| parent | 270c23348f820f9a109be283882f29c5d0dcc8b5 (diff) | |
Refs #1961 Adding new config parameter to configure the default hostname when it couldn't be detected
To test with this new code, please try 1.2-rc3, more info in: http://forum.piwik.org/read.php?2,72265
git-svn-id: http://dev.piwik.org/svn/trunk@3936 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/Mail.php')
| -rw-r--r-- | core/Mail.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/Mail.php b/core/Mail.php index 3b74504b14..93ce405fda 100644 --- a/core/Mail.php +++ b/core/Mail.php @@ -31,7 +31,8 @@ class Piwik_Mail extends Zend_Mail public function setFrom($email, $name = null) { - $piwikHost = Piwik_Url::getCurrentHost('piwik.org'); + $hostname = Zend_Registry::get('config')->mail->defaultHostnameIfEmpty; + $piwikHost = Piwik_Url::getCurrentHost($hostname); $email = str_replace('{DOMAIN}', $piwikHost, $email); parent::setFrom($email, $name); } |