From 1fa132fb5f94d1e460cc56460250df04394d200e Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Fri, 27 Sep 2024 20:52:03 +0200 Subject: [PATCH] Fixed issue with routing, that lead to invariant content underneath variant did not work correctly --- src/Umbraco.Core/Services/DocumentUrlService.cs | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/Umbraco.Core/Services/DocumentUrlService.cs b/src/Umbraco.Core/Services/DocumentUrlService.cs index 019a3ce13a..2964314399 100644 --- a/src/Umbraco.Core/Services/DocumentUrlService.cs +++ b/src/Umbraco.Core/Services/DocumentUrlService.cs @@ -225,7 +225,7 @@ public class DocumentUrlService : IDocumentUrlService var toDelete = new List(); var allCultures = documents.SelectMany(x => x.AvailableCultures ).Distinct(); - var languages = await _languageService.GetMultipleAsync(allCultures); + var languages = await _languageService.GetAllAsync(); var languageDictionary = languages.ToDictionary(x=>x.IsoCode); foreach (IContent document in documents) @@ -235,20 +235,9 @@ public class DocumentUrlService : IDocumentUrlService _logger.LogTrace("Rebuilding urls for document with key {DocumentKey}", document.Key); } - if (document.AvailableCultures.Any()) + foreach ((string culture, ILanguage language) in languageDictionary) { - foreach (var culture in document.AvailableCultures) - { - var language = languageDictionary[culture]; - - HandleCaching(_coreScopeProvider.Context!, document, culture, language, toDelete, toSave); - } - } - else - { - var language = await _languageService.GetDefaultLanguageAsync(); - - HandleCaching(_coreScopeProvider.Context!, document, null, language!, toDelete, toSave); + HandleCaching(_coreScopeProvider.Context!, document, document.ContentType.VariesByCulture() ? culture : null, language, toDelete, toSave); } }