From b6262bf33413493f952d088c4e61150b641998ec Mon Sep 17 00:00:00 2001
From: Marc Goodson <marc@snowmoon.co.uk>
Date: Mon, 25 May 2020 16:51:52 +0100
Subject: [PATCH] Remove ContentFinderByRedirectUrl if RedirectUrlTracking is
 disabled (#7761)

---
 src/Umbraco.Web/Runtime/WebInitialComposer.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/Runtime/WebInitialComposer.cs b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
index 203bae4854..c631aac5e3 100644
--- a/src/Umbraco.Web/Runtime/WebInitialComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebInitialComposer.cs
@@ -179,7 +179,7 @@ namespace Umbraco.Web.Runtime
                 .Remove<TinyMceValueConverter>()
                 .Remove<TextStringValueConverter>()
                 .Remove<MarkdownEditorValueConverter>();
-            
+
             // add all known factories, devs can then modify this list on application
             // startup either by binding to events or in their own global.asax
             composition.FilteredControllerFactory()
@@ -203,8 +203,12 @@ namespace Umbraco.Web.Runtime
                 .Append<ContentFinderByUrl>()
                 .Append<ContentFinderByIdPath>()
                 //.Append<ContentFinderByUrlAndTemplate>() // disabled, this is an odd finder
-                .Append<ContentFinderByUrlAlias>()
-                .Append<ContentFinderByRedirectUrl>();
+                .Append<ContentFinderByUrlAlias>();
+                //only append ContentFinderByRedirectUrl if RedirectUrlTracking is not disabled
+                if (composition.Configs.Settings().WebRouting.DisableRedirectUrlTracking == false)
+                {
+                    composition.ContentFinders().Append<ContentFinderByRedirectUrl>();
+                }
 
             composition.RegisterUnique<ISiteDomainHelper, SiteDomainHelper>();