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

Fixes null checks on all parts of VariationContextAccessor.VariationContext.Culture and fixes translations with tokens for url collisions

Browse Source
This commit is contained in:
Shannon
2018-07-10 12:43:07 +10:00
parent 6bcf1e4cd8
commit 7250b3d491
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,7 +181,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
if (!ContentType.VariesByCulture())
return _contentData.Name;
var culture = VariationContextAccessor.VariationContext.Culture;
var culture = VariationContextAccessor?.VariationContext?.Culture ?? "";
if (culture == "")
return _contentData.Name;
@@ -197,7 +197,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
if (!ContentType.VariesByCulture())
return _urlSegment;
var culture = VariationContextAccessor.VariationContext.Culture;
var culture = VariationContextAccessor?.VariationContext?.Culture ?? "";
if (culture == "")
return _urlSegment;
@@ -244,7 +244,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
{
// handle context culture
if (culture == null)
culture = VariationContextAccessor.VariationContext.Culture;
culture = VariationContextAccessor?.VariationContext?.Culture ?? "";
// no invariant culture infos
if (culture == "") return null;