Handle empty string as invariant when generating cache key

Author: nikolajlauridsen

src/Umbraco.Infrastructure/Routing/RedirectTrackingHandler.cs

@@ -118,8 +118,7 @@ private void StoreOldRoute(IContent entity, OldRoutesDictionary oldRoutes)
 
                 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 @@ private void CreateRedirects(OldRoutesDictionary oldRoutes)
 
             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);
             }
         }
 

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)
         {