From 9feee424305d382136fd3e597cceb83ea28cf8e7 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 6 Apr 2017 16:48:55 +0200 Subject: [PATCH] Oops, committed things to the wrong branch --- src/Umbraco.Core/Publishing/ScheduledPublisher.cs | 11 +---------- src/Umbraco.Core/Services/ContentService.cs | 4 +--- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Core/Publishing/ScheduledPublisher.cs b/src/Umbraco.Core/Publishing/ScheduledPublisher.cs index 0a6c2f48bb..94df1b88f1 100644 --- a/src/Umbraco.Core/Publishing/ScheduledPublisher.cs +++ b/src/Umbraco.Core/Publishing/ScheduledPublisher.cs @@ -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(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(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 { diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs index b832313582..1703768ed2 100644 --- a/src/Umbraco.Core/Services/ContentService.cs +++ b/src/Umbraco.Core/Services/ContentService.cs @@ -1124,9 +1124,7 @@ namespace Umbraco.Core.Services /// True if unpublishing succeeded, otherwise False public bool UnPublish(IContent content, int userId = 0) { - var attempt = ((IContentServiceOperations) this).UnPublish(content, userId); - LogHelper.Debug(string.Format("Result of unpublish attempt: {0}", attempt.Result.StatusType)); - return attempt.Success; + return ((IContentServiceOperations)this).UnPublish(content, userId).Success; } ///