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

Post merge fixes

Browse Source
This commit is contained in:
Bjarke Berg
2019-11-13 12:53:01 +01:00
parent 6dceb9c449
commit 0be396c4fd
23 changed files with 38 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/Configuration/ConfigsFactory.cs
View File

@@ -8,22 +8,20 @@ namespace Umbraco.Core.Configuration
public class ConfigsFactory : IConfigsFactory
{
private readonly IIOHelper _ioHelper;
private readonly ISystemDirectories _systemDirectories;
public ConfigsFactory(IIOHelper ioHelper, ISystemDirectories systemDirectories)
public ConfigsFactory(IIOHelper ioHelper)
{
_ioHelper = ioHelper;
_systemDirectories = systemDirectories;
}
public Configs Create() {
var configs = new Configs(section => ConfigurationManager.GetSection(section));
configs.Add<IGlobalSettings>(() => new GlobalSettings(_ioHelper, _systemDirectories));
configs.Add<IGlobalSettings>(() => new GlobalSettings(_ioHelper));
configs.Add<IUmbracoSettingsSection>("umbracoConfiguration/settings");
configs.Add<IHealthChecks>("umbracoConfiguration/HealthChecks");
configs.Add(() => new CoreDebug());
configs.AddCoreConfigs(_ioHelper, _systemDirectories);
configs.AddCoreConfigs(_ioHelper);
return configs;
}
}

14
src/Umbraco.Core/Configuration/GlobalSettings.cs
View File

@@ -20,7 +20,6 @@ namespace Umbraco.Core.Configuration
public class GlobalSettings : IGlobalSettings
{
private readonly IIOHelper _ioHelper;
private readonly ISystemDirectories _systemDirectories;
private string _localTempPath;
// TODO these should not be static
@@ -31,10 +30,9 @@ namespace Umbraco.Core.Configuration
internal const string StaticReservedPaths = "~/app_plugins/,~/install/,~/mini-profiler-resources/,"; //must end with a comma!
internal const string StaticReservedUrls = "~/config/splashes/noNodes.aspx,~/.well-known,"; //must end with a comma!
public GlobalSettings(IIOHelper ioHelper, ISystemDirectories systemDirectories)
public GlobalSettings(IIOHelper ioHelper)
{
_ioHelper = ioHelper;
_systemDirectories = systemDirectories;
}
/// <summary>
@@ -168,7 +166,7 @@ namespace Umbraco.Core.Configuration
}
set
{
SaveSetting(Constants.AppSettings.ConfigurationStatus, value, _ioHelper, _systemDirectories);
SaveSetting(Constants.AppSettings.ConfigurationStatus, value, _ioHelper);
}
}
@@ -177,9 +175,9 @@ namespace Umbraco.Core.Configuration
/// </summary>
/// <param name="key">Key of the setting to be saved.</param>
/// <param name="value">Value of the setting to be saved.</param>
internal static void SaveSetting(string key, string value, IIOHelper ioHelper, ISystemDirectories systemDirectories)
internal static void SaveSetting(string key, string value, IIOHelper ioHelper)
{
var fileName = ioHelper.MapPath(string.Format("{0}/web.config", systemDirectories.Root));
var fileName = ioHelper.MapPath(string.Format("{0}/web.config", ioHelper.Root));
var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
var appSettings = xml.Root.DescendantsAndSelf("appSettings").Single();
@@ -199,9 +197,9 @@ namespace Umbraco.Core.Configuration
/// Removes a setting from the configuration file.
/// </summary>
/// <param name="key">Key of the setting to be removed.</param>
internal static void RemoveSetting(string key, IIOHelper ioHelper, ISystemDirectories systemDirectories)
internal static void RemoveSetting(string key, IIOHelper ioHelper)
{
var fileName = ioHelper.MapPath(string.Format("{0}/web.config", systemDirectories.Root));
var fileName = ioHelper.MapPath(string.Format("{0}/web.config", ioHelper.Root));
var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
var appSettings = xml.Root.DescendantsAndSelf("appSettings").Single();