yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Assign ApplicationMainUrl in constructor of hosting environment if its specified in appsettings

Browse Source
This commit is contained in:
Nikolaj
2021-09-09 11:18:12 +02:00
parent 36582f2cd2
commit 7578d460c4
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.Common/AspNetCore/AspNetCoreHostingEnvironment.cs
View File

@@ -39,6 +39,11 @@ namespace Umbraco.Cms.Web.Common.AspNetCore
SiteName = webHostEnvironment.ApplicationName;
ApplicationPhysicalPath = webHostEnvironment.ContentRootPath;
if (_webRoutingSettings.CurrentValue.UmbracoApplicationUrl is not null)
{
ApplicationMainUrl = new Uri(_webRoutingSettings.CurrentValue.UmbracoApplicationUrl);
}
}
/// <inheritdoc/>
@@ -58,7 +63,7 @@ namespace Umbraco.Cms.Web.Common.AspNetCore
if (_applicationId != null)
{
return _applicationId;
}
}
var appId = _serviceProvider.GetApplicationUniqueIdentifier();
if (appId == null)
@@ -173,13 +178,13 @@ namespace Umbraco.Cms.Web.Common.AspNetCore
// (this is a simplified version of what was in 7.x)
// note: should this be optional? is it expensive?
if (currentApplicationUrl is null)
{
return;
}
if (!(_webRoutingSettings.CurrentValue.UmbracoApplicationUrl is null))
if (_webRoutingSettings.CurrentValue.UmbracoApplicationUrl is not null)
{
return;
}