lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 03:25:23 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : perf
This commit is contained in:
Louis DeJardin
2010-11-07 21:49:46 -08:00
parent 920924ddd7 e251fdb44e
commit 57db7fb94d
7 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/Shapes/DateTimeShapes.cs
View File

@@ -7,7 +7,7 @@ using Orchard.Mvc.Html;
using Orchard.Services;
namespace Orchard.Core.Shapes {
public class DateTimeShapes : IDependency {
public class DateTimeShapes : ISingletonDependency {
private readonly IClock _clock;
public DateTimeShapes(IClock clock) {

3
src/Orchard.Web/Modules/Orchard.Widgets/RuleEngine/BuiltinRuleProvider.cs
View File

@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Orchard.UI.Widgets;
namespace Orchard.Widgets.RuleEngine {

1
src/Orchard.Web/Modules/Orchard.Widgets/Services/WidgetsService.cs
View File

@@ -3,7 +3,6 @@ using System.Linq;
using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Aspects;
using Orchard.Core.Common.Models;
using Orchard.Environment.Features;
using Orchard.Widgets.Models;

7
src/Orchard/Events/IEventBusHandler.cs
View File

@@ -1,7 +0,0 @@
using System.Collections.Generic;
namespace Orchard.Events {
public interface IEventBusHandler : IDependency {
void Process(string messageName, IDictionary<string, string> eventData);
}
}

8
src/Orchard/Localization/Services/DefaultCultureManager.cs
View File

@@ -12,16 +12,16 @@ namespace Orchard.Localization.Services {
private readonly IRepository<CultureRecord> _cultureRepository;
private readonly IEnumerable<ICultureSelector> _cultureSelectors;
private readonly ISignals _signals;
private readonly IOrchardServices _orchardServices;
private readonly IWorkContextAccessor _workContextAccessor;
public DefaultCultureManager(IRepository<CultureRecord> cultureRepository,
IEnumerable<ICultureSelector> cultureSelectors,
ISignals signals,
IOrchardServices orchardServices) {
IWorkContextAccessor workContextAccessor) {
_cultureRepository = cultureRepository;
_cultureSelectors = cultureSelectors;
_signals = signals;
_orchardServices = orchardServices;
_workContextAccessor = workContextAccessor;
}
public IEnumerable<string> ListCultures() {
@@ -76,7 +76,7 @@ namespace Orchard.Localization.Services {
}
public string GetSiteCulture() {
return _orchardServices.WorkContext.CurrentSite == null ? null : _orchardServices.WorkContext.CurrentSite.SiteCulture;
return _workContextAccessor.GetContext().CurrentSite == null ? null : _workContextAccessor.GetContext().CurrentSite.SiteCulture;
}
// "<languagecode2>" or

8
src/Orchard/Localization/Services/SiteCultureSelector.cs
View File

@@ -3,14 +3,14 @@ using System.Web;
namespace Orchard.Localization.Services {
public class SiteCultureSelector : ICultureSelector {
private readonly IOrchardServices _orchardServices;
private readonly IWorkContextAccessor _workContextAccessor;
public SiteCultureSelector(IOrchardServices orchardServices) {
_orchardServices = orchardServices;
public SiteCultureSelector(IWorkContextAccessor workContextAccessor) {
_workContextAccessor = workContextAccessor;
}
public CultureSelectorResult GetCulture(HttpContextBase context) {
string currentCultureName = _orchardServices.WorkContext.CurrentSite.SiteCulture;
string currentCultureName = _workContextAccessor.GetContext().CurrentSite.SiteCulture;
if (String.IsNullOrEmpty(currentCultureName)) {
return null;

1
src/Orchard/Orchard.Framework.csproj
View File

@@ -659,7 +659,6 @@
<Compile Include="Events\EventsRegistrationSource.cs" />
<Compile Include="Environment\Configuration\IShellSettingsManagerEventHandler.cs" />
<Compile Include="Events\IEventBus.cs" />
<Compile Include="Events\IEventBusHandler.cs" />
<Compile Include="Environment\Extensions\Folders\AreaFolders.cs" />
<Compile Include="Environment\Extensions\Folders\ExtensionFolders.cs" />
<Compile Include="Environment\Extensions\Loaders\AreaExtensionLoader.cs" />