From c38703d29e0f6868814379b7099cabad6b97e263 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Fri, 30 Dec 2011 09:52:37 -0800 Subject: [PATCH] Replacing more WorkContext resolutions by IWorkContextAccessor --HG-- branch : 1.x --- .../Modules/Orchard.Email/Services/MissingSettingsBanner.cs | 4 ++-- .../Data/Migration/DataMigrationNotificationProvider.cs | 5 +++-- .../Modules/Orchard.Warmup/Services/SettingsBanner.cs | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Email/Services/MissingSettingsBanner.cs b/src/Orchard.Web/Modules/Orchard.Email/Services/MissingSettingsBanner.cs index a0adcb6b8..f2d639cb1 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Services/MissingSettingsBanner.cs +++ b/src/Orchard.Web/Modules/Orchard.Email/Services/MissingSettingsBanner.cs @@ -13,10 +13,10 @@ namespace Orchard.Email.Services private readonly IOrchardServices _orchardServices; private readonly WorkContext _workContext; - public MissingSettingsBanner(IOrchardServices orchardServices, WorkContext workContext) + public MissingSettingsBanner(IOrchardServices orchardServices, IWorkContextAccessor workContextAccessor) { _orchardServices = orchardServices; - _workContext = workContext; + _workContext = workContextAccessor.GetContext(); T = NullLocalizer.Instance; } diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Data/Migration/DataMigrationNotificationProvider.cs b/src/Orchard.Web/Modules/Orchard.Modules/Data/Migration/DataMigrationNotificationProvider.cs index a59beb7b7..eeea47f63 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Data/Migration/DataMigrationNotificationProvider.cs +++ b/src/Orchard.Web/Modules/Orchard.Modules/Data/Migration/DataMigrationNotificationProvider.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Web.Mvc; using System.Web.Routing; using Orchard.Data.Migration; +using Orchard.Environment; using Orchard.Environment.Extensions; using Orchard.Localization; using Orchard.Modules.Extensions; @@ -20,9 +21,9 @@ namespace Orchard.Modules.Data.Migration { private readonly IDataMigrationManager _dataMigrationManager; private readonly WorkContext _workContext; - public DataMigrationNotificationProvider(IDataMigrationManager dataMigrationManager, WorkContext workContext) { + public DataMigrationNotificationProvider(IDataMigrationManager dataMigrationManager, IWorkContextAccessor workContextAccessor) { _dataMigrationManager = dataMigrationManager; - _workContext = workContext; + _workContext = workContextAccessor.GetContext(); T = NullLocalizer.Instance; } diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Services/SettingsBanner.cs b/src/Orchard.Web/Modules/Orchard.Warmup/Services/SettingsBanner.cs index 936fa2c44..212f280fa 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/Services/SettingsBanner.cs +++ b/src/Orchard.Web/Modules/Orchard.Warmup/Services/SettingsBanner.cs @@ -9,9 +9,9 @@ namespace Orchard.Warmup.Services { private readonly IOrchardServices _orchardServices; private readonly WorkContext _workContext; - public SettingsBanner(IOrchardServices orchardServices, WorkContext workContext) { + public SettingsBanner(IOrchardServices orchardServices, IWorkContextAccessor workContextAccessor) { _orchardServices = orchardServices; - _workContext = workContext; + _workContext = workContextAccessor.GetContext(); T = NullLocalizer.Instance; }