From ab9e029525a20c8fd87200425c51e400e4ceb830 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 23 Jan 2018 13:04:57 +0100
Subject: [PATCH] U4-10853 - fix (scheduled) unpublishing issues

---
 .../Repositories/ContentRepository.cs          | 18 +-----------------
 src/Umbraco.Core/Services/ContentService.cs    |  4 ++--
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
index 6c00964c15..a10e8c62ab 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
@@ -693,27 +693,11 @@ namespace Umbraco.Core.Persistence.Repositories
             // else if unpublished then clear published version infos
             if (entity.Published)
             {
-                dto.DocumentPublishedReadOnlyDto = new DocumentPublishedReadOnlyDto
-                {
-                    VersionId = dto.VersionId,
-                    VersionDate = dto.UpdateDate,
-                    Newest = true,
-                    NodeId = dto.NodeId,
-                    Published = true
-                };
                 ((Content) entity).PublishedVersionGuid = dto.VersionId;
                 ((Content) entity).PublishedDate = dto.UpdateDate;
             }
-            else if (publishedStateChanged)
+            else
             {
-                dto.DocumentPublishedReadOnlyDto = new DocumentPublishedReadOnlyDto
-                {
-                    VersionId = default (Guid),
-                    VersionDate = default (DateTime),
-                    Newest = false,
-                    NodeId = dto.NodeId,
-                    Published = false
-                };
                 ((Content) entity).PublishedVersionGuid = default(Guid);
                 ((Content) entity).PublishedDate = default (DateTime);
             }
diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 3cbfd77045..faa48eb711 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -884,8 +884,8 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
             {
                 var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.Published && x.ExpireDate <= DateTime.Now);
-                return repository.GetByQuery(query);
+                var query = Query<IContent>.Builder.Where(x => x.ExpireDate <= DateTime.Now);
+                return repository.GetByQuery(query).Where(x => x.HasPublishedVersion);
             }
         }