diff options
| -rw-r--r-- | core/Mail.php | 6 | ||||
| -rw-r--r-- | core/Url.php | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/core/Mail.php b/core/Mail.php index 691c2ccc82..3b74504b14 100644 --- a/core/Mail.php +++ b/core/Mail.php @@ -31,11 +31,7 @@ class Piwik_Mail extends Zend_Mail public function setFrom($email, $name = null) { - $piwikHost = Piwik_Url::getCurrentHost(); - if(strlen($piwikHost) == 0) - { - $piwikHost = 'piwik.org'; - } + $piwikHost = Piwik_Url::getCurrentHost('piwik.org'); $email = str_replace('{DOMAIN}', $piwikHost, $email); parent::setFrom($email, $name); } diff --git a/core/Url.php b/core/Url.php index 7040814e70..b782bf95fe 100644 --- a/core/Url.php +++ b/core/Url.php @@ -171,7 +171,8 @@ class Piwik_Url } $default = Piwik_Common::sanitizeInputValue($default); - if(isset($_SERVER['HTTP_HOST'])) + if(isset($_SERVER['HTTP_HOST']) + && !empty($_SERVER['HTTP_HOST'])) { $default = Piwik_Common::sanitizeInputValue($_SERVER['HTTP_HOST']); } |