summaryrefslogtreecommitdiffstats
path: root/core/lostpassword/controller.php
diff options
context:
space:
mode:
authorBrice Maron <brice@bmaron.net>2013-02-20 21:14:55 +0100
committerBrice Maron <brice@bmaron.net>2013-02-20 21:14:55 +0100
commit4f4e81d3d273d31686b177e2533991c7f078fee4 (patch)
treee5de2c4a55041314608d23c474f98f09e82843c8 /core/lostpassword/controller.php
parent59fd9b2bd2a23e008a0be3180a423276d7a00f35 (diff)
downloadnextcloud-server-4f4e81d3d273d31686b177e2533991c7f078fee4.tar.gz
nextcloud-server-4f4e81d3d273d31686b177e2533991c7f078fee4.zip
Add message when trouble sending email ref #1799
Diffstat (limited to 'core/lostpassword/controller.php')
-rw-r--r--core/lostpassword/controller.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 3ef8eaf71aa..fbcf4a87f22 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -44,7 +44,11 @@ class OC_Core_LostPassword_Controller {
$msg = $tmpl->fetchPage();
$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');
+ try {
+ OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
+ } catch (Exception $e) {
+ OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
+ }
self::displayLostPasswordPage(false, true);
} else {
self::displayLostPasswordPage(true, false);