Merge branch 'master' into sabredav_1.6
This commit is contained in:
commit
9848bc33e5
|
@ -21,7 +21,8 @@ if (isset($_POST['user'])) {
|
||||||
$tmpl->assign('link', $link);
|
$tmpl->assign('link', $link);
|
||||||
$msg = $tmpl->fetchPage();
|
$msg = $tmpl->fetchPage();
|
||||||
$l = new OC_L10N('core');
|
$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));
|
OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => true));
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue