diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-07 19:11:55 +0000 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-07 19:11:55 +0000 |
| commit | cf02f3c1078b4b46fbf20d6269759b2b9b55aed8 (patch) | |
| tree | bc299b72312734184deae602d87c57b0d45dee6d /core | |
| parent | e8447e0bda25744c4836a8fdf009a98174264eda (diff) | |
| parent | d4f6f3e9355979aedb174d6f9b5f60380934aca9 (diff) | |
| download | nextcloud-server-cf02f3c1078b4b46fbf20d6269759b2b9b55aed8.tar.gz nextcloud-server-cf02f3c1078b4b46fbf20d6269759b2b9b55aed8.zip | |
Merge branch 'master' into multi_app_dir
Diffstat (limited to 'core')
| -rw-r--r-- | core/lostpassword/index.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php index f1d90eaeffe..6bed7bdd93f 100644 --- a/core/lostpassword/index.php +++ b/core/lostpassword/index.php @@ -23,7 +23,6 @@ if (isset($_POST['user'])) { $msg = $tmpl->fetchPage(); $l = OC_L10N::get('core'); $from = 'lostpassword-noreply@' . OCP\Util::getServerHost(); - $r=mail($email, $l->t('Owncloud password reset'), $msg, 'From:' . $from); OC_MAIL::send($email,$_POST['user'],$l->t('ownCloud password reset'),$msg,$from,'ownCloud'); echo('sent'); |