yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

Browse Source 
Conflicts:
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EmptyTemplate.cshtml
	src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
This commit is contained in:
Shannon
2014-01-15 13:28:41 +11:00
parent c527833081 3ef9635406
commit f27a0c0461
10 changed files with 148 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/UmbracoModule.cs
View File

@@ -204,7 +204,7 @@ namespace Umbraco.Web
internal static bool ShouldAuthenticateRequest(HttpRequestBase request, Uri originalRequestUrl)
{
if (//check back office
request.Url.IsBackOfficeRequest()
request.Url.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath)
//check installer
|| request.Url.IsInstallerRequest()
//detect in preview