DNN-10289:Message/Email Tokens Don't Reflect SSL

- changes make in LocalizationProvider
dnnsoftware · Nov 16, 2017 · 898cd77 · 898cd77
1 parent 41ac727
commit 898cd77
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/DNN Platform/Library/Services/Localization/LocalizationProvider.cs b/DNN Platform/Library/Services/Localization/LocalizationProvider.cs
@@ -97,7 +97,19 @@ public string GetString(string key, string resourceFileRoot, string language, Po
                 Logger.WarnFormat("Missing localization key. key:{0} resFileRoot:{1} threadCulture:{2} userlan:{3}", key, resourceFileRoot, Thread.CurrentThread.CurrentUICulture, language);
             }
 
-            return string.IsNullOrEmpty(resourceValue) ? string.Empty : resourceValue;
+            return string.IsNullOrEmpty(resourceValue) ? string.Empty : RemoveHttpUrlsIfSiteisSSLEnabled(resourceValue);
+        }
+
+        private string RemoveHttpUrlsIfSiteisSSLEnabled(string resourceValue)
+        {
+            var portalSettings = PortalController.Instance.GetCurrentPortalSettings();
+
+            if (portalSettings.SSLEnabled)
+            {
+                resourceValue = resourceValue.Replace(@"http:", @"https:");
+            }
+
+            return resourceValue;
         }
 
         /// <summary>