From 383e947bf7efaeb9699a5755156820c7879b0505 Mon Sep 17 00:00:00 2001 From: Nicholas Mayne Date: Fri, 13 Mar 2015 17:06:48 +0000 Subject: [PATCH] Because the admin filter is calling lcoalization, and localization is calling the admin filter... we should apply the admin attribute first, then do the security check --- src/Orchard/UI/Admin/AdminFilter.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Orchard/UI/Admin/AdminFilter.cs b/src/Orchard/UI/Admin/AdminFilter.cs index cd78c4e37..1efbf43b8 100644 --- a/src/Orchard/UI/Admin/AdminFilter.cs +++ b/src/Orchard/UI/Admin/AdminFilter.cs @@ -20,11 +20,11 @@ namespace Orchard.UI.Admin { public void OnAuthorization(AuthorizationContext filterContext) { if (IsAdmin(filterContext)) { + Apply(filterContext.RequestContext); + if (!_authorizer.Authorize(StandardPermissions.AccessAdminPanel, T("Can't access the admin"))) { filterContext.Result = new HttpUnauthorizedResult(); } - - Apply(filterContext.RequestContext); } }