Merge pull request #12081 from umbraco/v9/bugfix/fix-invariant-redirect-tracking

Fix invariant redirect tracking

Author: Zeegaan

src/Umbraco.Core/Routing/DefaultUrlProvider.cs

@@ -159,7 +159,7 @@ internal UrlInfo GetUrlFromRoute(
                 : DomainUtilities.DomainForNode(umbracoContext.PublishedSnapshot.Domains, _siteDomainMapper, int.Parse(route.Substring(0, pos), CultureInfo.InvariantCulture), current, culture);
 
             var defaultCulture = _localizationService.GetDefaultLanguageIsoCode();
-            if (domainUri is not null || culture is null || culture.Equals(defaultCulture, StringComparison.InvariantCultureIgnoreCase))
+            if (domainUri is not null || string.IsNullOrEmpty(culture) || culture.Equals(defaultCulture, StringComparison.InvariantCultureIgnoreCase))
             {
                 var url = AssembleUrl(domainUri, path, current, mode).ToString();
                 return UrlInfo.Url(url, culture);

src/Umbraco.Infrastructure/Routing/RedirectTrackingHandler.cs

@@ -99,25 +99,32 @@ private void StoreOldRoute(IContent entity, OldRoutesDictionary oldRoutes)
             {
                 return;
             }
-            var contentCache = publishedSnapshot.Content;
-            var entityContent = contentCache?.GetById(entity.Id);
-            if (entityContent == null)
+
+            IPublishedContentCache contentCache = publishedSnapshot.Content;
+            IPublishedContent entityContent = contentCache?.GetById(entity.Id);
+            if (entityContent is null)
+            {
                 return;
+            }
 
             // get the default affected cultures by going up the tree until we find the first culture variant entity (default to no cultures)
             var defaultCultures = entityContent.AncestorsOrSelf()?.FirstOrDefault(a => a.Cultures.Any())?.Cultures.Keys.ToArray()
                 ?? new[] { (string)null };
-            foreach (var x in entityContent.DescendantsOrSelf(_variationContextAccessor))
+
+            foreach (IPublishedContent publishedContent in entityContent.DescendantsOrSelf(_variationContextAccessor))
             {
                 // if this entity defines specific cultures, use those instead of the default ones
-                var cultures = x.Cultures.Any() ? x.Cultures.Keys : defaultCultures;
+                IEnumerable<string> cultures = publishedContent.Cultures.Any() ? publishedContent.Cultures.Keys : defaultCultures;
 
                 foreach (var culture in cultures)
                 {
-                    var route = contentCache.GetRouteById(x.Id, culture);
+                    var route = contentCache.GetRouteById(publishedContent.Id, culture);
                     if (IsNotRoute(route))
+                    {
                         continue;
-                    oldRoutes[new ContentIdAndCulture(x.Id, culture)] = new ContentKeyAndOldRoute(x.Key, route);
+                    }
+
+                    oldRoutes[new ContentIdAndCulture(publishedContent.Id, culture)] = new ContentKeyAndOldRoute(publishedContent.Key, route);
                 }
             }
         }
@@ -135,13 +142,16 @@ private void CreateRedirects(OldRoutesDictionary oldRoutes)
             {
                 _logger.LogWarning("Could not track redirects because there is no current published snapshot available.");
                 return;
-            } 
+            }
 
-            foreach (var oldRoute in oldRoutes)
+            foreach (KeyValuePair<ContentIdAndCulture, ContentKeyAndOldRoute> oldRoute in oldRoutes)
             {
                 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, oldRoute.Key.Culture);
             }
         }

src/Umbraco.PublishedCache.NuCache/CacheKeys.cs

@@ -13,9 +13,7 @@ private static string DraftOrPub(bool previewing)
 
         [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)
         {