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

Refactor variations

Browse Source
This commit is contained in:
Stephan
2018-06-20 14:18:57 +02:00
parent a697608529
commit ecf9a928d7
56 changed files with 1121 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
View File

@@ -178,7 +178,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
{
get
{
if (!ContentType.Variations.Has(ContentVariation.CultureNeutral)) // fixme CultureSegment?
if (!ContentType.VariesByCulture())
return _contentData.Name;
var culture = VariationContextAccessor.VariationContext.Culture;
@@ -194,7 +194,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
{
get
{
if (!ContentType.Variations.Has(ContentVariation.CultureNeutral)) // fixme CultureSegment?
if (!ContentType.VariesByCulture())
return _urlSegment;
var culture = VariationContextAccessor.VariationContext.Culture;
@@ -258,7 +258,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
{
get
{
if (!ContentType.Variations.Has(ContentVariation.CultureNeutral)) // fixme CultureSegment?
if (!ContentType.VariesByCulture())
return NoCultureInfos;
if (_cultureInfos != null) return _cultureInfos;