Updated parameter with LoginTabId instead of TabName

dnnsoftware · Oct 15, 2020 · 66b5eda · 66b5eda
1 parent 2ff69fb
commit 66b5eda
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/DNN Platform/Website/DesktopModules/Admin/Authentication/Login.ascx.cs b/DNN Platform/Website/DesktopModules/Admin/Authentication/Login.ascx.cs
@@ -806,13 +806,13 @@ private string GetLoginPath()
             }
 
             var tab = TabController.Instance.GetTab(this.PortalSettings.LoginTabId, this.PortalId);
-            return tab != null ? new Uri(this._navigationManager.NavigateURL(tab.TabName)).LocalPath : LOGIN_PATH;
+            return tab != null ? new Uri(this._navigationManager.NavigateURL(this.PortalSettings.LoginTabId), UriKind.RelativeOrAbsolute).LocalPath : LOGIN_PATH;
         }
 
         private bool IsRedirectingFromLoginUrl()
         {
             return this.Request.UrlReferrer != null &&
-                this.GetLoginPath().StartsWith(this.Request.UrlReferrer.LocalPath, StringComparison.InvariantCultureIgnoreCase);
+                this.Request.UrlReferrer.LocalPath.EndsWith(GetLoginPath(), StringComparison.InvariantCultureIgnoreCase);
         }
 
         private void AddLoginControlAttributes(AuthenticationLoginBase loginControl)