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

Merge branch 'dev-v7' into 7.3.0

Browse Source 
Conflicts:
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
	src/Umbraco.Web/Scheduling/LogScrubber.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/content.cs
This commit is contained in:
Shannon
2015-03-27 15:15:49 +11:00
parent 4e195543ea ec742d1f66
commit cd3191012f
7 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/Routing/ContentFinderByIdPath.cs
View File

@@ -2,6 +2,7 @@ using System;
using Umbraco.Core.Logging;
using Umbraco.Core.Models;
using Umbraco.Core;
using Umbraco.Core.Configuration;
namespace Umbraco.Web.Routing
{
@@ -20,6 +21,9 @@ namespace Umbraco.Web.Routing
/// <returns>A value indicating whether an Umbraco document was found and assigned.</returns>
public bool TryFindContent(PublishedContentRequest docRequest)
{
if (UmbracoConfig.For.UmbracoSettings().WebRouting.DisableFindContentByIdPath)
return false;
IPublishedContent node = null;
var path = docRequest.Uri.GetAbsolutePathDecoded();

3
src/Umbraco.Web/Scheduling/LogScrubber.cs
View File

@@ -51,7 +51,6 @@ namespace Umbraco.Web.Scheduling
}
// scrubbing interval, in milliseconds
public static int GetLogScrubbingInterval(IUmbracoSettingsSection settings)
{
var interval = 4 * 60 * 60 * 1000; // 4 hours, in milliseconds
@@ -62,7 +61,7 @@ namespace Umbraco.Web.Scheduling
}
catch (Exception e)
{
LogHelper.Error<Scheduler>("Unable to locate a log scrubbing interval. Defaulting to 4 hours.", e);
LogHelper.Error<LogScrubber>("Unable to locate a log scrubbing interval. Defaulting to 4 hours.", e);
}
return interval;
}