Merge pull request #6199 from johnhenley/issues/notification-subject-…

…6176

ENH: Use message subject when sending instant subscription messages

DNN Platform/Library/Services/Social/Messaging/Scheduler/CoreMessagingScheduler.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
@@ -695,7 +695,6 @@ private void SendMessage(MessageRecipient messageRecipient)
             var defaultLanguage = toUser.Profile.PreferredLocale;
             var portalSettings = new PortalSettings(message.PortalID);
 
-            var emailSubjectTemplate = GetEmailSubjectTemplate(portalSettings, defaultLanguage);
             var emailBodyTemplate = GetEmailBodyTemplate(portalSettings, defaultLanguage);
             var emailBodyItemTemplate = GetEmailBodyItemTemplate(portalSettings, defaultLanguage);
 
@@ -709,7 +708,12 @@ private void SendMessage(MessageRecipient messageRecipient)
                 var senderName = GetSenderName(author.DisplayName, portalSettings.PortalName);
                 var senderAddress = GetSenderAddress(senderName, portalSettings.Email);
                 var emailBodyItemContent = GetEmailItemContent(portalSettings, messageRecipient, emailBodyItemTemplate);
-                var subject = string.Format(emailSubjectTemplate, portalSettings.PortalName);
+                var subject = InternalMessagingController.Instance.GetMessage(message.MessageID).Subject;
+                if (string.IsNullOrEmpty(subject))
+                {
+                    subject = string.Format(GetEmailSubjectTemplate(portalSettings, defaultLanguage), portalSettings.PortalName);
+                }
+
                 var body = GetEmailBody(emailBodyTemplate, emailBodyItemContent, portalSettings, toUser);
                 body = RemoveHttpUrlsIfSiteisSSLEnabled(body, portalSettings);