Run localization after authentication

mtrutledge · Oct 31, 2020 · 104a928 · 104a928
1 parent bb391b7
commit 104a928
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/DNN Platform/HttpModules/Localization/LocalizationModule.cs b/DNN Platform/HttpModules/Localization/LocalizationModule.cs
@@ -15,7 +15,7 @@ public class LocalizationModule : IHttpModule
         /// <inheritdoc />
         public void Init(HttpApplication context)
         {
-            context.BeginRequest += Context_BeginRequest;
+            context.PreRequestHandlerExecute += Context_PreRequestHandlerExecute;
         }
 
         /// <inheritdoc />
@@ -24,16 +24,25 @@ public void Dispose()
             // intentionally left empty
         }
 
-        private static void Context_BeginRequest(object sender, EventArgs e)
+        private static void Context_PreRequestHandlerExecute(object sender, EventArgs e)
         {
+            var isPage = HttpContext.Current.CurrentHandler is Framework.PageBase;
+            if (!isPage)
+            {
+                return;
+            }
+
             var isInstallPage = HttpContext.Current.Request.Url.LocalPath.ToLowerInvariant().Contains("installwizard.aspx");
             if (isInstallPage)
             {
                 return;
             }
 
             var portalSettings = PortalController.Instance.GetCurrentSettings();
-            Localization.SetThreadCultures(Localization.GetPageLocale(portalSettings), portalSettings);
+            if (portalSettings != null)
+            {
+                Localization.SetThreadCultures(Localization.GetPageLocale(portalSettings), portalSettings);
+            }
         }
     }
 }