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

Removed erroneous HttpContextBase registrations

Browse Source
This commit is contained in:
Sebastien Ros
2015-09-04 12:12:02 -07:00
parent 04f29ba70c
commit c860b89e23
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Orchard/Environment/WorkContextModule.cs
View File

@@ -6,7 +6,6 @@ using System.Web;
using Autofac; using Autofac;
using Autofac.Builder; using Autofac.Builder;
using Autofac.Core; using Autofac.Core;
using Autofac.Features.Metadata;
using Module = Autofac.Module; using Module = Autofac.Module;
namespace Orchard.Environment { namespace Orchard.Environment {
@@ -24,10 +23,6 @@ namespace Orchard.Environment {
.As<WorkContextProperty<HttpContextBase>>() .As<WorkContextProperty<HttpContextBase>>()
.InstancePerMatchingLifetimeScope("work"); .InstancePerMatchingLifetimeScope("work");
builder.Register(ctx => ctx.Resolve<WorkContextProperty<HttpContextBase>>().Value)
.As<HttpContextBase>()
.InstancePerDependency();
builder.RegisterGeneric(typeof(WorkValues<>)) builder.RegisterGeneric(typeof(WorkValues<>))
.InstancePerMatchingLifetimeScope("work"); .InstancePerMatchingLifetimeScope("work");

5
src/Orchard/Mvc/MvcModule.cs
View File

@@ -52,11 +52,6 @@ namespace Orchard.Mvc {
var baseUrl = new Func<string>(() => siteService.GetSiteSettings().BaseUrl); var baseUrl = new Func<string>(() => siteService.GetSiteSettings().BaseUrl);
var httpContextBase = new HttpContextPlaceholder(baseUrl); var httpContextBase = new HttpContextPlaceholder(baseUrl);
if (httpContextBase == null) {
context.Resolve<IWorkContextAccessor>().CreateWorkContextScope();
return context.Resolve<IHttpContextAccessor>().Current();
}
context.Resolve<IWorkContextAccessor>().CreateWorkContextScope(httpContextBase); context.Resolve<IWorkContextAccessor>().CreateWorkContextScope(httpContextBase);
return httpContextBase; return httpContextBase;
} }