Merge branch 'master' into sabredav_1.6

This commit is contained in:
Georg Ehrke 2012-03-19 09:14:15 +01:00
commit 9848bc33e5
1 changed files with 2 additions and 1 deletions

View File

@ -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 {