From bdd3727804091c1e9ebc97bb96ba552b0e8ec366 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Fri, 7 Jan 2011 16:33:01 -0800
Subject: [PATCH] Correcting the message sent to moderate the accounts

--HG--
branch : 1.x
---
 .../Modules/Orchard.Users/Handlers/UserMessagesAlteration.cs  | 4 ++--
 .../Modules/Orchard.Users/Services/MembershipService.cs       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserMessagesAlteration.cs b/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserMessagesAlteration.cs
index cc244e7fd..6a0ed0377 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserMessagesAlteration.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserMessagesAlteration.cs
@@ -32,8 +32,8 @@ namespace Orchard.Users.Handlers {
                 return;
 
             if ( context.Type == MessageTypes.Moderation ) {
-                context.MailMessage.Subject = T("User needs moderation").Text;
-                context.MailMessage.Body = T("The following user account needs to be moderated: {0}", recipient.UserName).Text;
+                context.MailMessage.Subject = T("New account").Text;
+                context.MailMessage.Body = T("The user <b>{0}</b> with email <b>{1}</b> has requested a new account. This user won't be able to log while his account has not been approved.", context.Properties["UserName"], context.Properties["Email"]).Text;
             }
 
             if (context.Type == MessageTypes.Validation) {
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs b/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
index 9f48eb4e3..163685cc1 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
@@ -89,7 +89,7 @@ namespace Orchard.Users.Services {
                     }
                     var recipient = GetUser(userName);
                     if (recipient != null)
-                        _messageManager.Send(recipient.ContentItem.Record, MessageTypes.Moderation, "email");
+                        _messageManager.Send(recipient.ContentItem.Record, MessageTypes.Moderation, "email" , new Dictionary<string, string> { { "UserName", createUserParams.Username}, { "Email" , createUserParams.Email } });
                 }
             }