diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 22:40:35 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 22:40:35 +0100 |
| commit | bae175518427de1f43ac23dbc1e06a15f6933370 (patch) | |
| tree | 90cdee24789526b1b6da16eda90e2c1547a66e62 /core/lostpassword | |
| parent | 39d874cd902a4e3d4f7ae313ec5e15bafe35df13 (diff) | |
| parent | 08d7b8ce309baebfc243727c215b63e732bf874e (diff) | |
| download | nextcloud-server-bae175518427de1f43ac23dbc1e06a15f6933370.tar.gz nextcloud-server-bae175518427de1f43ac23dbc1e06a15f6933370.zip | |
Merge branch 'master' into fixing-784-master
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
lib/helper.php
Diffstat (limited to 'core/lostpassword')
| -rw-r--r-- | core/lostpassword/controller.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php index e64b16d3b83..3ef8eaf71aa 100644 --- a/core/lostpassword/controller.php +++ b/core/lostpassword/controller.php @@ -45,8 +45,6 @@ class OC_Core_LostPassword_Controller { $l = OC_L10N::get('core'); $from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply'); OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud'); - echo('Mailsent'); - self::displayLostPasswordPage(false, true); } else { self::displayLostPasswordPage(true, false); |