From 68353f9d0655830f94626813eb7e94652bbd1454 Mon Sep 17 00:00:00 2001 From: Andy Butland Date: Tue, 19 Apr 2022 08:13:24 +0200 Subject: [PATCH] Fixes RedirectToUmbracoPageResult to handle redirects to pages with domains defined on them (#12259) * Fixes RedirectToUmbracoPageResult to handle redirects to pages with domains defined on them. * Renamed variable to match with updated service type. * Apply suggestions from code review Co-authored-by: Ronald Barendse * Fixed usage of IUrlHelper. Co-authored-by: Ronald Barendse --- .../ActionResults/RedirectToUmbracoPageResult.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoPageResult.cs b/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoPageResult.cs index 62d0dc7a10..9cbbe91f11 100644 --- a/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoPageResult.cs +++ b/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoPageResult.cs @@ -2,9 +2,9 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Routing; using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.Extensions.DependencyInjection; -using Umbraco.Cms.Core.IO; using Umbraco.Cms.Core.Models.PublishedContent; using Umbraco.Cms.Core.Routing; using Umbraco.Cms.Core.Web; @@ -122,8 +122,9 @@ namespace Umbraco.Cms.Web.Website.ActionResults } HttpContext httpContext = context.HttpContext; - IIOHelper ioHelper = httpContext.RequestServices.GetRequiredService(); - string destinationUrl = ioHelper.ResolveUrl(Url); + IUrlHelperFactory urlHelperFactory = httpContext.RequestServices.GetRequiredService(); + IUrlHelper urlHelper = urlHelperFactory.GetUrlHelper(context); + string destinationUrl = urlHelper.Content(Url); if (_queryString.HasValue) { @@ -134,6 +135,5 @@ namespace Umbraco.Cms.Web.Website.ActionResults return Task.CompletedTask; } - } }