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

Handle empty string as invariant when generating cache key

Browse Source
This commit is contained in:
nikolajlauridsen
2022-03-01 13:51:21 +01:00
parent dfbb182a94
commit 993c582bd9
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Infrastructure/Routing/RedirectTrackingHandler.cs
View File

@@ -118,8 +118,7 @@ namespace Umbraco.Cms.Core.Routing
foreach (var culture in cultures)
{
var checkedCulture = string.IsNullOrEmpty(culture) ? null : culture;
var route = contentCache.GetRouteById(publishedContent.Id, checkedCulture);
var route = contentCache.GetRouteById(publishedContent.Id, culture);
if (IsNotRoute(route))
{
continue;
@@ -147,14 +146,13 @@ namespace Umbraco.Cms.Core.Routing
foreach (KeyValuePair<ContentIdAndCulture, ContentKeyAndOldRoute> oldRoute in oldRoutes)
{
var culture = string.IsNullOrWhiteSpace(oldRoute.Key.Culture) ? null : oldRoute.Key.Culture;
var newRoute = contentCache.GetRouteById(oldRoute.Key.ContentId, culture);
var newRoute = contentCache.GetRouteById(oldRoute.Key.ContentId, oldRoute.Key.Culture);
if (IsNotRoute(newRoute) || oldRoute.Value.OldRoute == newRoute)
{
continue;
}
_redirectUrlService.Register(oldRoute.Value.OldRoute, oldRoute.Value.ContentKey, culture);
_redirectUrlService.Register(oldRoute.Value.OldRoute, oldRoute.Value.ContentKey, oldRoute.Key.Culture);
}
}

4
src/Umbraco.PublishedCache.NuCache/CacheKeys.cs
View File

@@ -13,9 +13,7 @@ namespace Umbraco.Cms.Infrastructure.PublishedCache
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static string LangId(string culture)
{
return culture != null ? ("-L:" + culture) : string.Empty;
}
=> string.IsNullOrEmpty(culture) ? string.Empty : ("-L:" + culture);
public static string PublishedContentChildren(Guid contentUid, bool previewing)
{