From c55cf75ada217e34a322a4f3dea5d7bbe4fb912f Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 11 Sep 2017 13:30:06 +0200 Subject: [PATCH] Use HttpContext from the controller --- .../Configuration/ClientDependencyConfiguration.cs | 5 +++-- src/Umbraco.Web/Install/Controllers/InstallController.cs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Core/Configuration/ClientDependencyConfiguration.cs b/src/Umbraco.Core/Configuration/ClientDependencyConfiguration.cs index e0d92f52f1..b3076f2143 100644 --- a/src/Umbraco.Core/Configuration/ClientDependencyConfiguration.cs +++ b/src/Umbraco.Core/Configuration/ClientDependencyConfiguration.cs @@ -57,7 +57,8 @@ namespace Umbraco.Core.Configuration /// /// Clears the temporary files stored for the ClientDependency folder /// - internal bool ClearTempFiles() + /// + internal bool ClearTempFiles(HttpContextBase currentHttpContext) { var cdfTempDirectories = new HashSet(); foreach (BaseCompositeFileProcessingProvider provider in ClientDependencySettings.Instance @@ -69,7 +70,7 @@ namespace Umbraco.Core.Configuration try { - var relativePath = HttpContext.Current.Server.MapPath(XmlFileMapper.FileMapVirtualFolder); + var relativePath = currentHttpContext.Server.MapPath(XmlFileMapper.FileMapVirtualFolder); if (relativePath != null) { var directoryInfo = new DirectoryInfo(relativePath); diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs index 0ad837b239..7e3336e1e8 100644 --- a/src/Umbraco.Web/Install/Controllers/InstallController.cs +++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs @@ -48,7 +48,7 @@ namespace Umbraco.Web.Install.Controllers var clientDependencyConfig = new ClientDependencyConfiguration(ApplicationContext.Current.ProfilingLogger.Logger); var clientDependencyUpdated = clientDependencyConfig.IncreaseVersionNumber(); // Delete ClientDependency temp directories to make sure we get fresh caches - var clientDependencyTempFilesDeleted = clientDependencyConfig.ClearTempFiles(); + var clientDependencyTempFilesDeleted = clientDependencyConfig.ClearTempFiles(HttpContext); var result = _umbracoContext.Security.ValidateCurrentUser(false);