From 39492f96540c090295a8f9f97ad7bc5e4e8c8526 Mon Sep 17 00:00:00 2001
From: Vitor Rodrigues <vsilvar@users.noreply.github.com>
Date: Sun, 1 Oct 2023 12:45:41 +0200
Subject: [PATCH] Fixed URL tracking not working for invariant pages with
 culture variant ancestors

---
 .../Repositories/Implement/RedirectUrlRepository.cs        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RedirectUrlRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RedirectUrlRepository.cs
index 1c2da42561..7e4c56f117 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RedirectUrlRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RedirectUrlRepository.cs
@@ -1,5 +1,4 @@
 using System.Security.Cryptography;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using NPoco;
 using Umbraco.Cms.Core;
@@ -44,7 +43,7 @@ internal class RedirectUrlRepository : EntityRepositoryBase<Guid, IRedirectUrl>,
         return dto == null ? null : Map(dto);
     }
 
-    public  async Task<IRedirectUrl?> GetMostRecentUrlAsync(string url)
+    public async Task<IRedirectUrl?> GetMostRecentUrlAsync(string url)
     {
         Sql<ISqlContext> sql = GetMostRecentSql(url);
         List<RedirectUrlDto> dtos = await Database.FetchAsync<RedirectUrlDto>(sql);
@@ -71,7 +70,7 @@ internal class RedirectUrlRepository : EntityRepositoryBase<Guid, IRedirectUrl>,
         Sql<ISqlContext> sql = GetMostRecentUrlSql(url, culture);
 
         List<RedirectUrlDto> dtos = Database.Fetch<RedirectUrlDto>(sql);
-        RedirectUrlDto? dto = dtos.FirstOrDefault(f => f.Culture == culture.ToLower());
+        RedirectUrlDto? dto = dtos.FirstOrDefault(f => culture.InvariantEquals(f.Culture));
 
         if (dto == null)
         {
@@ -102,7 +101,7 @@ internal class RedirectUrlRepository : EntityRepositoryBase<Guid, IRedirectUrl>,
         Sql<ISqlContext> sql = GetMostRecentUrlSql(url, culture);
 
         List<RedirectUrlDto> dtos = await Database.FetchAsync<RedirectUrlDto>(sql);
-        RedirectUrlDto? dto = dtos.FirstOrDefault(f => f.Culture == culture.ToLower());
+        RedirectUrlDto? dto = dtos.FirstOrDefault(f => culture.InvariantEquals(f.Culture));
 
         if (dto == null)
         {