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

ping pong with shan's reviews - checks for doctype/contenttype is variant or not

Browse Source
This commit is contained in:
Warren Buckley
2018-09-13 13:25:54 +01:00
parent 082d6e6792
commit 4782f03334
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/Models/Mapping/ContentMapperProfile.cs
View File

@@ -98,7 +98,7 @@ namespace Umbraco.Web.Models.Mapping
var culture = context.GetCulture();
//a culture needs to be in the context for a variant content item
if (culture == null)
if (culture == null || source.ContentType.VariesByCulture() == false)
return source.UpdateDate;
var pubDate = source.GetPublishDate(culture);
@@ -113,7 +113,7 @@ namespace Umbraco.Web.Models.Mapping
var culture = context.GetCulture();
//a culture needs to be in the context for a variant content item
if (culture == null)
if (culture == null || source.ContentType.VariesByCulture() == false)
return source.Published;
return source.IsCulturePublished(culture);
@@ -127,7 +127,7 @@ namespace Umbraco.Web.Models.Mapping
var culture = context.GetCulture();
//a culture needs to be in the context for a variant content item
if (culture == null)
if (culture == null || source.ContentType.VariesByCulture() == false)
return source.Name;
if (source.CultureNames.TryGetValue(culture, out var name) && !string.IsNullOrWhiteSpace(name))