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

Make sure the install doesn't fail if the user opts out of a custom machine key

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-01-28 19:21:59 +01:00
committed by Sebastiaan Janssen
parent 9d37e7ceda
commit 55aec0bf07
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/Install/InstallSteps/ConfigureMachineKey.cs
View File

@@ -33,7 +33,7 @@ namespace Umbraco.Web.Install.InstallSteps
/// <returns></returns> /// <returns></returns>
public override Task<InstallSetupResult> ExecuteAsync(bool? model) public override Task<InstallSetupResult> ExecuteAsync(bool? model)
{ {
if (model.HasValue && model.Value == false) return null; if (model.HasValue && model.Value == false) return Task.FromResult<InstallSetupResult>(null);
//install the machine key //install the machine key
var fileName = IOHelper.MapPath($"{SystemDirectories.Root}/web.config"); var fileName = IOHelper.MapPath($"{SystemDirectories.Root}/web.config");
@@ -43,7 +43,7 @@ namespace Umbraco.Web.Install.InstallSteps
// Update appSetting if it exists, or else create a new appSetting for the given key and value // Update appSetting if it exists, or else create a new appSetting for the given key and value
var machineKey = systemWeb.Descendants("machineKey").FirstOrDefault(); var machineKey = systemWeb.Descendants("machineKey").FirstOrDefault();
if (machineKey != null) return null; if (machineKey != null) return Task.FromResult<InstallSetupResult>(null);
var generator = new MachineKeyGenerator(); var generator = new MachineKeyGenerator();
var generatedSection = generator.GenerateConfigurationBlock(); var generatedSection = generator.GenerateConfigurationBlock();