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

Merge branch 'netcore/feature/abstract-systemdirectories' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project

Browse Source 
# Conflicts:
#	src/Umbraco.Abstractions/IO/IIOHelper.cs
#	src/Umbraco.Core/IO/IOHelper.cs
This commit is contained in:
Bjarke Berg
2019-11-13 13:26:44 +01:00
parent 0be396c4fd b721e75cd2
commit 5edac2a476
4 changed files with 77 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -384,5 +384,43 @@ namespace Umbraco.Core.Configuration
}
}
}
private string _umbracoMediaPath = null;
public string UmbracoMediaPath => GetterWithDefaultValue(Constants.AppSettings.UmbracoMediaPath, "~/umbraco", ref _umbracoMediaPath);
private string _umbracoScriptsPath = null;
public string UmbracoScriptsPath => GetterWithDefaultValue(Constants.AppSettings.UmbracoScriptsPath, "~/umbraco", ref _umbracoScriptsPath);
private string _umbracoCssPath = null;
public string UmbracoCssPath => GetterWithDefaultValue(Constants.AppSettings.UmbracoCssPath, "~/umbraco", ref _umbracoCssPath);
private string _umbracoPath = null;
public string UmbracoPath => GetterWithDefaultValue(Constants.AppSettings.UmbracoPath, "~/umbraco", ref _umbracoPath);
private T GetterWithDefaultValue<T>(string appSettingKey, T defaultValue, ref T backingField)
{
if (backingField != null) return backingField;
if (ConfigurationManager.AppSettings.ContainsKey(appSettingKey))
{
try
{
var value = ConfigurationManager.AppSettings[appSettingKey];
backingField = (T)Convert.ChangeType(value, typeof(T));
}
catch
{
/* ignore and use default value */
backingField = defaultValue;
}
}
else
{
backingField = defaultValue;
}
return backingField;
}
}
}