From 961433c82ca4cab789acd605027b0a8c2941575f Mon Sep 17 00:00:00 2001
From: Sujith H <sharidasan@owncloud.com>
Date: Fri, 17 May 2019 17:56:14 +0530
Subject: [PATCH] [stable10] Backport of Use html body for message sent via
 email for password change

Use html body for message sent via email
for password change.

Signed-off-by: Sujith H <sharidasan@owncloud.com>
---
 settings/Controller/UsersController.php           | 5 ++++-
 tests/Settings/Controller/UsersControllerTest.php | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index c3b41a86dbf3..b43264e088fd 100644
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -719,11 +719,14 @@ protected function sendNotificationMail($userId) {
 		if ($email !== '') {
 			$tmpl = new \OC_Template('core', 'lostpassword/notify');
 			$msg = $tmpl->fetchPage();
+			$tmplAlt = new \OC_Template('core', 'lostpassword/altnotify');
+			$msgAlt = $tmplAlt->fetchPage();
 
 			$message = $this->mailer->createMessage();
 			$message->setTo([$email => $userId]);
 			$message->setSubject($this->l10n->t('%s password changed successfully', [$this->defaults->getName()]));
-			$message->setPlainBody($msg);
+			$message->setPlainBody($msgAlt);
+			$message->setHtmlBody($msg);
 			$message->setFrom([$this->fromMailAddress => $this->defaults->getName()]);
 			$this->mailer->send($message);
 		}
diff --git a/tests/Settings/Controller/UsersControllerTest.php b/tests/Settings/Controller/UsersControllerTest.php
index 08f325794937..289802cab7d7 100644
--- a/tests/Settings/Controller/UsersControllerTest.php
+++ b/tests/Settings/Controller/UsersControllerTest.php
@@ -3304,6 +3304,9 @@ public function testSetPasswordSendMailFailed() {
 		$message->expects($this->once())
 			->method('setPlainBody')
 			->willReturn($message);
+		$message->expects($this->once())
+			->method('setHtmlBody')
+			->willReturn($message);
 		$message->expects($this->once())
 			->method('setFrom')
 			->willReturn($message);