Fix #742

skoruba · Oct 27, 2020 · 1994d91 · 1994d91
1 parent 0c88814
commit 1994d91
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Skoruba.IdentityServer4.Admin/Views/Shared/Common/SelectLanguage.cshtml b/src/Skoruba.IdentityServer4.Admin/Views/Shared/Common/SelectLanguage.cshtml
@@ -9,7 +9,7 @@
     var cultureItems = LocOptions.Value.SupportedUICultures
         .Select(c => new SelectListItem { Value = c.Name, Text = c.DisplayName })
         .ToList();
-    var returnUrl = string.IsNullOrEmpty(Context.Request.Path) ? "~/" : $"~{Context.Request.Path.Value}";
+    var returnUrl = string.IsNullOrEmpty(Context.Request.Path) ? "~/" : $"~{Context.Request.Path.Value}{Context.Request.QueryString}";
 }
 @if (cultureItems.Count > 1)
 {

diff --git a/src/Skoruba.IdentityServer4.STS.Identity/Views/Shared/Common/SelectLanguage.cshtml b/src/Skoruba.IdentityServer4.STS.Identity/Views/Shared/Common/SelectLanguage.cshtml
@@ -9,7 +9,7 @@
     var cultureItems = LocOptions.Value.SupportedUICultures
         .Select(c => new SelectListItem { Value = c.Name, Text = c.DisplayName })
         .ToList();
-    var returnUrl = string.IsNullOrEmpty(Context.Request.Path) ? "~/" : $"~{Context.Request.Path.Value}";
+    var returnUrl = string.IsNullOrEmpty(Context.Request.Path) ? "~/" : $"~{Context.Request.Path.Value}{Context.Request.QueryString}";
 }
 @if (cultureItems.Count > 1)
 {