- You have been invited by %1% to the Umbraco Back Office. + You have been invited by %1% to the Umbraco Back Office.
Message from %1%: diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml index cab8037aad..7216cd2f68 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -1912,7 +1912,7 @@ To manage your website, simply open the Umbraco back office and start adding con Hi %0%,
- You have been invited by %1% to the Umbraco Back Office. + You have been invited by %1% to the Umbraco Back Office.
Message from %1%: diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs index 2e6cd5dbbf..cbfed2b91c 100644 --- a/src/Umbraco.Web/Editors/UsersController.cs +++ b/src/Umbraco.Web/Editors/UsersController.cs @@ -410,7 +410,7 @@ namespace Umbraco.Web.Editors //send the email - await SendUserInviteEmailAsync(display, Security.CurrentUser.Name, user, userSave.Message); + await SendUserInviteEmailAsync(display, Security.CurrentUser.Name, Security.CurrentUser.Email, user, userSave.Message); return display; } @@ -447,7 +447,7 @@ namespace Umbraco.Web.Editors return attempt.Result; } - private async Task SendUserInviteEmailAsync(UserBasic userDisplay, string from, IUser to, string message) + private async Task SendUserInviteEmailAsync(UserBasic userDisplay, string from, string fromEmail, IUser to, string message) { var token = await UserManager.GenerateEmailConfirmationTokenAsync((int)userDisplay.Id); @@ -476,7 +476,7 @@ namespace Umbraco.Web.Editors var emailBody = Services.TextService.Localize("user/inviteEmailCopyFormat", //Ensure the culture of the found user is used for the email! UserExtensions.GetUserCulture(to.Language, Services.TextService), - new[] { userDisplay.Name, from, message, inviteUri.ToString() }); + new[] { userDisplay.Name, from, message, inviteUri.ToString(), fromEmail }); await UserManager.EmailService.SendAsync( //send the special UmbracoEmailMessage which configures it's own sender @@ -722,4 +722,4 @@ namespace Umbraco.Web.Editors } } -} \ No newline at end of file +}