diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-20 22:41:39 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-20 22:41:39 +0200 |
| commit | 711aa229b882d3fc5e2fa8c22e6db2ec05642984 (patch) | |
| tree | 5098a6dacf65a3d557977ff39b52ac527a0eb777 /core | |
| parent | 12ef2f5054ebae12853f51d067993b825e4b4286 (diff) | |
| parent | 0f5864d864f63a7142064d142661c46644b2d0db (diff) | |
| download | nextcloud-server-711aa229b882d3fc5e2fa8c22e6db2ec05642984.tar.gz nextcloud-server-711aa229b882d3fc5e2fa8c22e6db2ec05642984.zip | |
Merge branch 'master' into movable_apps
Diffstat (limited to 'core')
| -rw-r--r-- | core/lostpassword/index.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php index 89bb6cfa794..b6cdd601d66 100644 --- a/core/lostpassword/index.php +++ b/core/lostpassword/index.php @@ -22,7 +22,10 @@ if (isset($_POST['user'])) { $msg = $tmpl->fetchPage(); $l = OC_L10N::get('core'); $from = 'lostpassword-noreply@' . $_SERVER['HTTP_HOST']; - mail($email, $l->t('Owncloud password reset'), $msg, 'From:' . $from); + $r=mail($email, $l->t('Owncloud password reset'), $msg, 'From:' . $from); +//if($r==false) echo('error'); else echo('works!!!!!!!'); + OC_MAIL::send($email,$_POST['user'],$l->t('Owncloud password reset'),$msg,$from,'ownCloud'); + } OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => true)); } else { |