From ac2e533343d04ef3d3e8932fe00faaf2174400d5 Mon Sep 17 00:00:00 2001 From: Andre Rodrigues Date: Tue, 14 Dec 2010 23:37:23 -0800 Subject: [PATCH] Adding messageprepared flag to user registration email event handler to allow handler swaping. --HG-- branch : dev --- .../Modules/Orchard.Users/Handlers/UserMessagesAlteration.cs | 4 ++++ src/Orchard/Messaging/Models/MessageContext.cs | 1 + 2 files changed, 5 insertions(+) diff --git a/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserMessagesAlteration.cs b/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserMessagesAlteration.cs index 5cde4ed1c..cc244e7fd 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserMessagesAlteration.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserMessagesAlteration.cs @@ -20,6 +20,9 @@ namespace Orchard.Users.Handlers { public Localizer T { get; set; } public void Sending(MessageContext context) { + if (context.MessagePrepared) + return; + var contentItem = _contentManager.Get(context.Recipient.Id); if ( contentItem == null ) return; @@ -51,6 +54,7 @@ namespace Orchard.Users.Handlers { } FormatEmailBody(context); + context.MessagePrepared = true; } private static void FormatEmailBody(MessageContext context) { diff --git a/src/Orchard/Messaging/Models/MessageContext.cs b/src/Orchard/Messaging/Models/MessageContext.cs index 63885700f..e9be7e161 100644 --- a/src/Orchard/Messaging/Models/MessageContext.cs +++ b/src/Orchard/Messaging/Models/MessageContext.cs @@ -9,6 +9,7 @@ namespace Orchard.Messaging.Models { public string Service { get; set; } public ContentItemRecord Recipient { get; set; } public Dictionary Properties { get; private set; } + public bool MessagePrepared { get; set; } public MessageContext() { Properties = new Dictionary();