From 9b01910d44b4a720e065f9ebadcbe4995f490276 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Mon, 28 Jan 2019 08:27:42 +0100 Subject: [PATCH] Removed isPublished stuff from XmlPublishedContent. --- .../XmlPublishedContentInitBenchmarks.cs | 8 ++++---- .../XmlPublishedCache/XmlPublishedContent.cs | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Tests.Benchmarks/XmlPublishedContentInitBenchmarks.cs b/src/Umbraco.Tests.Benchmarks/XmlPublishedContentInitBenchmarks.cs index 860dc0ac4b..bc18b97d47 100644 --- a/src/Umbraco.Tests.Benchmarks/XmlPublishedContentInitBenchmarks.cs +++ b/src/Umbraco.Tests.Benchmarks/XmlPublishedContentInitBenchmarks.cs @@ -145,7 +145,7 @@ namespace Umbraco.Tests.Benchmarks XmlPublishedContent.InitializeNode(null, _xml10.DocumentElement, false, out id, out key, out template, out sortOrder, out name, out writerName, out urlName, out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path, - out createDate, out updateDate, out level, out isDraft, out isPublished, out publishedContentType, + out createDate, out updateDate, out level, out isDraft, out publishedContentType, out properties, GetPublishedContentType); } @@ -155,7 +155,7 @@ namespace Umbraco.Tests.Benchmarks XmlPublishedContent.InitializeNode(null, _xml100.DocumentElement, false, out id, out key, out template, out sortOrder, out name, out writerName, out urlName, out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path, - out createDate, out updateDate, out level, out isDraft, out isPublished,out publishedContentType, + out createDate, out updateDate, out level, out isDraft, out publishedContentType, out properties, GetPublishedContentType); } @@ -165,7 +165,7 @@ namespace Umbraco.Tests.Benchmarks XmlPublishedContent.InitializeNode(null, _xml1000.DocumentElement, false, out id, out key, out template, out sortOrder, out name, out writerName, out urlName, out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path, - out createDate, out updateDate, out level, out isDraft, out isPublished,out publishedContentType, + out createDate, out updateDate, out level, out isDraft,out publishedContentType, out properties, GetPublishedContentType); } @@ -175,7 +175,7 @@ namespace Umbraco.Tests.Benchmarks XmlPublishedContent.InitializeNode(null, _xml10000.DocumentElement, false, out id, out key, out template, out sortOrder, out name, out writerName, out urlName, out creatorName, out creatorId, out writerId, out docTypeAlias, out nodeType, out path, - out createDate, out updateDate, out level, out isDraft, out isPublished,out publishedContentType, + out createDate, out updateDate, out level, out isDraft,out publishedContentType, out properties, GetPublishedContentType); } diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs index f601114ffd..3db52616e8 100644 --- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs +++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs @@ -63,7 +63,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache private int _sortOrder; private int _level; private bool _isDraft; - private bool _isPublished; + public override IEnumerable Children { @@ -232,7 +232,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache public override bool IsPublished(string culture = null) { EnsureNodeInitialized(); - return _isPublished; // bah + return true; // Intentionally not implemented, because the XmlPublishedContent should not support this. } public override IEnumerable Properties @@ -287,7 +287,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache InitializeNode(this, _xmlNode, _isPreviewing, out _id, out _key, out _template, out _sortOrder, out _name, out _writerName, out _urlName, out _creatorName, out _creatorId, out _writerId, out _docTypeAlias, out _docTypeId, out _path, - out _createDate, out _updateDate, out _level, out _isDraft, out _isPublished, out _contentType, out _properties, + out _createDate, out _updateDate, out _level, out _isDraft, out _contentType, out _properties, _contentTypeCache.Get); _nodeInitialized = true; @@ -297,7 +297,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache internal static void InitializeNode(XmlPublishedContent node, XmlNode xmlNode, bool isPreviewing, out int id, out Guid key, out int template, out int sortOrder, out string name, out string writerName, out string urlName, out string creatorName, out int creatorId, out int writerId, out string docTypeAlias, out int docTypeId, out string path, - out DateTime createDate, out DateTime updateDate, out int level, out bool isDraft,out bool isPublished, + out DateTime createDate, out DateTime updateDate, out int level, out bool isDraft, out PublishedContentType contentType, out Dictionary properties, Func getPublishedContentType) { @@ -309,7 +309,6 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache name = writerName = urlName = creatorName = docTypeAlias = path = null; createDate = updateDate = default(DateTime); isDraft = false; - isPublished = false; // fixme not implemented? contentType = null; properties = null;