Simplify cookie setting to avoid duplicate language cookies being set

mtrutledge · Oct 31, 2020 · 2435e14 · 2435e14
1 parent 104a928
commit 2435e14
Showing 1 changed file with 4 additions and 19 deletions.
diff --git a/DNN Platform/Library/Services/Localization/Localization.cs b/DNN Platform/Library/Services/Localization/Localization.cs
@@ -1569,26 +1569,11 @@ public static void SetLanguage(string value)
                 }
 
                 // save the page culture as a cookie
-                HttpCookie cookie = response.Cookies.Get("language");
-                if (cookie == null)
+                response.Cookies.Remove("language");
+                if (!string.IsNullOrEmpty(value))
                 {
-                    if (!string.IsNullOrEmpty(value))
-                    {
-                        cookie = new HttpCookie("language", value) { Path = !string.IsNullOrEmpty(Globals.ApplicationPath) ? Globals.ApplicationPath : "/" };
-                        response.Cookies.Add(cookie);
-                    }
-                }
-                else
-                {
-                    cookie.Value = value;
-                    if (!string.IsNullOrEmpty(value))
-                    {
-                        response.Cookies.Set(cookie);
-                    }
-                    else
-                    {
-                        response.Cookies.Remove("language");
-                    }
+                    var cookie = new HttpCookie("language", value) { Path = !string.IsNullOrEmpty(Globals.ApplicationPath) ? Globals.ApplicationPath : "/" };
+                    response.Cookies.Add(cookie);
                 }
             }
             catch