From 8edc0f210bd95a917551cf785584182bcfe867e1 Mon Sep 17 00:00:00 2001
From: Myles McNamara <myles@hostt.net>
Date: Sat, 3 Aug 2013 00:00:32 -0400
Subject: [PATCH 1/3] use theme name and title for password reset

password reset email uses owncloud, updated to use theme settings
---
 core/lostpassword/controller.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 2f996365219..de7af21c07b 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -57,7 +57,8 @@ class OC_Core_LostPassword_Controller {
 				$l = OC_L10N::get('core');
 				$from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
 				try {
-					OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
+					$defaults = new OC_Defaults();
+					OC_Mail::send($email, $_POST['user'], $l->t($defaults->getTitle(); . ' password reset'), $msg, $from, $defaults->getName());
 				} catch (Exception $e) {
 					OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
 				}

From 74a264e82e86449c696b413d760c61d8f41b587c Mon Sep 17 00:00:00 2001
From: Myles McNamara <myles@hostt.net>
Date: Sat, 3 Aug 2013 18:47:27 -0400
Subject: [PATCH 2/3] fix syntax error

accidentally had ; included, and changed concatenating
---
 core/lostpassword/controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index de7af21c07b..20445afe3fe 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -58,7 +58,7 @@ class OC_Core_LostPassword_Controller {
 				$from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
 				try {
 					$defaults = new OC_Defaults();
-					OC_Mail::send($email, $_POST['user'], $l->t($defaults->getTitle(); . ' password reset'), $msg, $from, $defaults->getName());
+					OC_Mail::send($email, $_POST['user'], $l->t('%s password reset', array($defaults->getTitle())), $msg, $from, $defaults->getName());
 				} catch (Exception $e) {
 					OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
 				}

From f5d23c469d15f09c0591da7634853508592a79f3 Mon Sep 17 00:00:00 2001
From: Myles McNamara <myles@hostt.net>
Date: Thu, 8 Aug 2013 16:21:47 -0400
Subject: [PATCH 3/3] use getName instead of getTitle

---
 core/lostpassword/controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 20445afe3fe..74a5be2b96f 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -58,7 +58,7 @@ class OC_Core_LostPassword_Controller {
 				$from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply');
 				try {
 					$defaults = new OC_Defaults();
-					OC_Mail::send($email, $_POST['user'], $l->t('%s password reset', array($defaults->getTitle())), $msg, $from, $defaults->getName());
+					OC_Mail::send($email, $_POST['user'], $l->t('%s password reset', array($defaults->getName())), $msg, $from, $defaults->getName());
 				} catch (Exception $e) {
 					OC_Template::printErrorPage( 'A problem occurs during sending the e-mail please contact your administrator.');
 				}