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.Core/ConfigsExtensions.cs
This commit is contained in:
Bjarke Berg
2019-11-12 15:32:45 +01:00
parent 3ffa7700ff 42904d63aa
commit 424260ac2b
71 changed files with 252 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Runtime/WebInitialComponent.cs
View File

@@ -112,7 +112,7 @@ namespace Umbraco.Web.Runtime
private static void ConfigureClientDependency(IGlobalSettings globalSettings)
{
// Backwards compatibility - set the path and URL type for ClientDependency 1.5.1 [LK]
XmlFileMapper.FileMapDefaultFolder = SystemDirectories.TempData.EnsureEndsWith('/') + "ClientDependency";
XmlFileMapper.FileMapDefaultFolder = Current.SystemDirectories.TempData.EnsureEndsWith('/') + "ClientDependency";
BaseCompositeFileProcessingProvider.UrlTypeDefault = CompositeUrlType.Base64QueryStrings;
// Now we need to detect if we are running 'Umbraco.Core.LocalTempStorage' as EnvironmentTemp and in that case we want to change the CDF file