From cfcdcae64a7984c94a28717ab3afa4c01df26e92 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 12 May 2020 10:51:59 +0200 Subject: [PATCH] Cleanup and fixed issue with permanent redirect --- src/Umbraco.Core/UriExtensions.cs | 2 +- .../Extensions/UmbracoInstallApplicationBuilderExtensions.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Core/UriExtensions.cs b/src/Umbraco.Core/UriExtensions.cs index 00cdb8fe48..9da4db110c 100644 --- a/src/Umbraco.Core/UriExtensions.cs +++ b/src/Umbraco.Core/UriExtensions.cs @@ -117,7 +117,7 @@ namespace Umbraco.Core .TrimStart("/"); //check if this is in the umbraco back office - return afterAuthority.InvariantStartsWith(hostingEnvironment.ToAbsolute("~/install").TrimStart("/")); + return afterAuthority.InvariantStartsWith(hostingEnvironment.ToAbsolute(Constants.SystemDirectories.Install).TrimStart("/")); } /// diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoInstallApplicationBuilderExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoInstallApplicationBuilderExtensions.cs index fcc8cc8e30..1173015865 100644 --- a/src/Umbraco.Web.Common/Extensions/UmbracoInstallApplicationBuilderExtensions.cs +++ b/src/Umbraco.Web.Common/Extensions/UmbracoInstallApplicationBuilderExtensions.cs @@ -50,9 +50,9 @@ namespace Umbraco.Extensions var uri = context.Request.GetEncodedUrl(); // redirect to install ReportRuntime(logger, runtime.Level, "Umbraco must install or upgrade."); - + var installUrl = $"{installPath}?redir=true&url={uri}"; - context.Response.Redirect(installUrl, true); + context.Response.Redirect(installUrl, false); return Task.CompletedTask; });