- After some discussion, we've decided that this particular Send() me…

…thod of the SMTPComponent should also check the from address and use the GlobalAttribute setting like it did before the cc47358 commit. (re fixes #798)
SparkDevNetwork · Feb 13, 2015 · 37a10dc · 37a10dc
1 parent db19fba
commit 37a10dc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/Rock/Communication/SMTPComponent.cs b/Rock/Communication/SMTPComponent.cs
@@ -131,12 +131,21 @@ public override void Send( Rock.Model.Communication communication )
 
                 var globalAttributes = Rock.Web.Cache.GlobalAttributesCache.Read();
 
-                // From
+                // From - if none is set, use the one in the Organization's GlobalAttributes.
                 string fromAddress = communication.GetMediumDataValue( "FromAddress" );
+                if ( string.IsNullOrWhiteSpace( fromAddress ) )
+                {
+                    fromAddress = globalAttributes.GetValue( "OrganizationEmail" );
+                }
+
+                string fromName = communication.GetMediumDataValue( "FromName" );
+                if ( string.IsNullOrWhiteSpace( fromName ) )
+                {
+                    fromName = globalAttributes.GetValue( "OrganizationName" );
+                }
+
                 MailMessage message = new MailMessage();
-                message.From = new MailAddress(
-                    fromAddress,
-                    communication.GetMediumDataValue( "FromName" ) );
+                message.From = new MailAddress( fromAddress, fromName );
 
                 // Reply To
                 string replyTo = communication.GetMediumDataValue( "ReplyTo" );

diff --git a/RockWeb/Blocks/Crm/PhotoSendRequest.ascx.cs b/RockWeb/Blocks/Crm/PhotoSendRequest.ascx.cs
@@ -415,10 +415,6 @@ private void GetTemplateData()
             if ( template != null )
             {
                 var mediumData = template.MediumData;
-                if ( !mediumData.ContainsKey( "FromAddress" ) )
-                {
-                    throw new Exception( string.Format( "The '{0}' communication template is missing a From address.", template.Name ) );
-                }
 
                 if ( !mediumData.ContainsKey( "Subject" ) )
                 {