From 4f4e81d3d273d31686b177e2533991c7f078fee4 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Wed, 20 Feb 2013 21:14:55 +0100
Subject: [PATCH] Add message when trouble sending email ref #1799

---
 core/lostpassword/controller.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 3ef8eaf71a..fbcf4a87f2 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);