diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-03-21 09:43:29 +0100 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-03-21 09:43:29 +0100 |
| commit | 61166c1002a7a44351e27b17d651afd3afc2f3b5 (patch) | |
| tree | 07791fad64994853b853ef4c05716aede31f6918 /core | |
| parent | ddb7197c9c8cf67d7bec8b7045551a99b236ad01 (diff) | |
| parent | 19bbb61b20e1e9a7c7d4f9ef645ab65fcc453416 (diff) | |
| download | nextcloud-server-61166c1002a7a44351e27b17d651afd3afc2f3b5.tar.gz nextcloud-server-61166c1002a7a44351e27b17d651afd3afc2f3b5.zip | |
Merge branch 'master' into calendar_sharing
Diffstat (limited to 'core')
| -rw-r--r-- | core/lostpassword/index.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php index 30caa2d23da..da0428e3ced 100644 --- a/core/lostpassword/index.php +++ b/core/lostpassword/index.php @@ -21,7 +21,8 @@ if (isset($_POST['user'])) { $tmpl->assign('link', $link); $msg = $tmpl->fetchPage(); $l = new OC_L10N('core'); - mail($email, $l->t('Owncloud password reset'), $msg); + $from = 'lostpassword-noreply@' . $_SERVER['HTTP_HOST']; + mail($email, $l->t('Owncloud password reset'), $msg, 'From:' . $from); } OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => true)); } else { |