Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(emailTemplate): use instance Name instead of Url in subject #50692

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(emailTemplate): use instance Name instead of Url in subject #50692

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86c351d
fix(emailTemplate): use instance Name instead of Url in subject
solracsf Feb 6, 2025
35edc54
fix: add missing var
solracsf Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/settings/lib/Hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ public function onChangeEmail(IUser $user, $oldMailAddress) {
->setType('personal_settings')
->setAffectedUser($user->getUID());

$instanceName = $this->defaults->getName();
$instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
$language = $this->languageFactory->getUserLanguage($user);
$l = $this->languageFactory->get('settings', $language);
Expand Down Expand Up @@ -159,7 +160,7 @@ public function onChangeEmail(IUser $user, $oldMailAddress) {
'instanceUrl' => $instanceUrl,
]);

$template->setSubject($l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
$template->setSubject($l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceName]));
$template->addHeader();
$template->addHeading($l->t('Email address changed for %s', [$user->getDisplayName()]), false);
$template->addBodyText($text . ' ' . $l->t('If you did not request this, please contact an administrator.'));
Expand Down
Loading