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

Oops, committed things to the wrong branch

Browse Source
This commit is contained in:
Sebastiaan Janssen
2017-04-06 16:48:55 +02:00
parent 16582c8207
commit 9feee42430
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Core/Publishing/ScheduledPublisher.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Linq;
using Umbraco.Core.Logging;
using Umbraco.Core.Models;
using Umbraco.Core.Services;
@@ -27,10 +26,6 @@ namespace Umbraco.Core.Publishing
public int CheckPendingAndProcess()
{
var counter = 0;
var contentForRelease = _contentService.GetContentForRelease().ToArray();
if(contentForRelease.Any())
LogHelper.Debug<ScheduledPublisher>(string.Format("There's {0} items of content that need to be published", contentForRelease.Count()));
foreach (var d in _contentService.GetContentForRelease())
{
try
@@ -59,11 +54,7 @@ namespace Umbraco.Core.Publishing
throw;
}
}
var contentForExpiration = _contentService.GetContentForExpiration().ToArray();
if(contentForExpiration.Any())
LogHelper.Debug<ScheduledPublisher>(string.Format("There's {0} items of content that need to be unpublished", contentForExpiration.Count()));
foreach (var d in contentForExpiration)
foreach (var d in _contentService.GetContentForExpiration())
{
try
{

4
src/Umbraco.Core/Services/ContentService.cs
View File

@@ -1124,9 +1124,7 @@ namespace Umbraco.Core.Services
/// <returns>True if unpublishing succeeded, otherwise False</returns>
public bool UnPublish(IContent content, int userId = 0)
{
var attempt = ((IContentServiceOperations) this).UnPublish(content, userId);
LogHelper.Debug<ContentService>(string.Format("Result of unpublish attempt: {0}", attempt.Result.StatusType));
return attempt.Success;
return ((IContentServiceOperations)this).UnPublish(content, userId).Success;
}
/// <summary>