diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-01-01 01:18:02 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-01-01 01:18:02 +0000 |
| commit | cbb2db8622dbcff2314204bc548ebdd3005bd0fc (patch) | |
| tree | bbe14faf0201b4131b8ca9c9d4eac59edb7da5e8 /core | |
| parent | e7de25434206a4849a7c7315d4d9926325c7b730 (diff) | |
| parent | eb4cd869107d4afa1c259751e765ca39defb9279 (diff) | |
| download | nextcloud-server-cbb2db8622dbcff2314204bc548ebdd3005bd0fc.tar.gz nextcloud-server-cbb2db8622dbcff2314204bc548ebdd3005bd0fc.zip | |
Fix merge conflicts
Diffstat (limited to 'core')
| -rw-r--r-- | core/lostpassword/index.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php index de0d393ec78..ede94dab2d7 100644 --- a/core/lostpassword/index.php +++ b/core/lostpassword/index.php @@ -14,7 +14,7 @@ if (isset($_POST['user'])) { if (OC_User::userExists($_POST['user'])) { $token = sha1($_POST['user']+uniqId()); OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', $token); - $email = OC_Preferences::getValue($_POST['user'], 'lostpassword', 'email', ''); + $email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', ''); if (!empty($email)) { $link = OC_Helper::linkTo('core/lostpassword', 'resetpassword.php', null, true).'?user='.$_POST['user'].'&token='.$token; $tmpl = new OC_Template('core/lostpassword', 'email'); |