From 676a7d15a716cad697d0a5f25abf0a00f876a918 Mon Sep 17 00:00:00 2001 From: loudej Date: Fri, 20 Nov 2009 00:58:06 +0000 Subject: [PATCH] Changed partial to ensure the area from the resulting link if present in the current request --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041472 --- src/Orchard.Web/Views/Shared/LogOnUserControl.ascx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Views/Shared/LogOnUserControl.ascx b/src/Orchard.Web/Views/Shared/LogOnUserControl.ascx index 794ae2626..0b584d958 100644 --- a/src/Orchard.Web/Views/Shared/LogOnUserControl.ascx +++ b/src/Orchard.Web/Views/Shared/LogOnUserControl.ascx @@ -2,13 +2,17 @@ <% if (Request.IsAuthenticated) { %> - Welcome <%=Html.Encode(Page.User.Identity.Name)%>! - [ <%=Html.ActionLink("Log Off", "LogOff", "Account")%> ] +Welcome + <%=Html.Encode(Page.User.Identity.Name)%>! [ +<%=Html.ActionLink("Log Off", "LogOff", "Account", new { area = "" }, new { })%> +] <% } else { -%> - [ <%=Html.ActionLink("Log On", "LogOn", "Account")%> ] +%> +[ +<%=Html.ActionLink("Log On", "LogOn", "Account", new{area=""}, new{})%> +] <% } %>