diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-21 22:12:31 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-21 22:12:31 +0200 |
| commit | e29ae46609f42a03ade20c7f935e2cded84db51f (patch) | |
| tree | b896f79353e792c5d34d7dc8dc9220c49bbfd6df /core | |
| parent | cf492a96496920c42f3ad384f5ca0886a5323c72 (diff) | |
| parent | 6bfe2289be05e9f54272a86a0f957ec41ef32e28 (diff) | |
| download | nextcloud-server-e29ae46609f42a03ade20c7f935e2cded84db51f.tar.gz nextcloud-server-e29ae46609f42a03ade20c7f935e2cded84db51f.zip | |
fix merge conflicts
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 { |