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

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/boot-failed-exception

Browse Source
This commit is contained in:
Shannon
2020-05-18 16:20:25 +10:00
parent 3d9603e669 c36c2f6a33
commit 06ce62d922
33 changed files with 1039 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web.Common/Extensions/LinkGeneratorExtensions.cs
View File

@@ -3,6 +3,7 @@ using Umbraco.Core;
using Microsoft.AspNetCore.Routing;
using System.Reflection;
using Umbraco.Web.Common.Install;
using Umbraco.Core.Hosting;
namespace Umbraco.Extensions
{
@@ -13,7 +14,7 @@ namespace Umbraco.Extensions
/// </summary>
/// <param name="url"></param>
/// <returns></returns>
public static string GetBackOfficeUrl(this LinkGenerator linkGenerator)
public static string GetBackOfficeUrl(this LinkGenerator linkGenerator, IHostingEnvironment hostingEnvironment)
{
Type backOfficeControllerType;
@@ -22,9 +23,9 @@ namespace Umbraco.Extensions
backOfficeControllerType = Assembly.Load("Umbraco.Web.BackOffice")?.GetType("Umbraco.Web.BackOffice.Controllers.BackOfficeController");
if (backOfficeControllerType == null) return "/"; // this would indicate that the installer is installed without the back office
}
catch (Exception)
catch
{
return "/"; // this would indicate that the installer is installed without the back office
return hostingEnvironment.ApplicationVirtualPath; // this would indicate that the installer is installed without the back office
}
return linkGenerator.GetPathByAction("Default", ControllerExtensions.GetControllerName(backOfficeControllerType), new { area = Constants.Web.Mvc.BackOfficeApiArea });
@@ -37,7 +38,7 @@ namespace Umbraco.Extensions
/// <returns></returns>
public static string GetInstallerUrl(this LinkGenerator linkGenerator)
{
return linkGenerator.GetPathByAction("Index", ControllerExtensions.GetControllerName<InstallController>(), new { area = Constants.Web.Mvc.InstallArea });
return linkGenerator.GetPathByAction(nameof(InstallController.Index), ControllerExtensions.GetControllerName<InstallController>(), new { area = Constants.Web.Mvc.InstallArea });
}
}
}