summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-08-14 12:04:40 -0700
committerThomas Müller <thomas.mueller@tmit.eu>2013-08-14 12:04:40 -0700
commit06670cef8ab02e0c06be3abf749358938bb9fe45 (patch)
treea6e755af4a0c9c2c3460d7b9bb70780a55fd7e9d
parent994537a5b94826294e61231768f27964bc736ced (diff)
parentf5d23c469d15f09c0591da7634853508592a79f3 (diff)
downloadnextcloud-server-06670cef8ab02e0c06be3abf749358938bb9fe45.tar.gz
nextcloud-server-06670cef8ab02e0c06be3abf749358938bb9fe45.zip
Merge pull request #4304 from tripflex/lostpw-themed
use theme name and title for password reset
-rw-r--r--core/lostpassword/controller.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index 2f996365219..74a5be2b96f 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('%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.');
}