Fix handling of returnurl parameter in UserProfile component

2024-02-17 09:11:56 -08:00
parent 766a190015
commit 57a86cd836
1 changed files with 10 additions and 1 deletions
--- a/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/UserProfile.razor
@ -31,7 +31,16 @@

    protected override void OnParametersSet()
    {
-        _returnurl = WebUtility.UrlEncode(PageState.Route.PathAndQuery);
+		if (!PageState.QueryString.ContainsKey("returnurl"))
+		{
+			// remember current url
+			_returnurl += WebUtility.UrlEncode(PageState.Route.PathAndQuery);
+		}
+		else
+		{
+			// use existing value
+			_returnurl += PageState.QueryString["returnurl"];
+		}
    }
 }