From c860b89e23b7cf62a1eedf18df5aff436a9c81bb Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastienros@gmail.com>
Date: Fri, 4 Sep 2015 12:12:02 -0700
Subject: [PATCH] Removed erroneous HttpContextBase registrations

---
 src/Orchard/Environment/WorkContextModule.cs | 5 -----
 src/Orchard/Mvc/MvcModule.cs                 | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/src/Orchard/Environment/WorkContextModule.cs b/src/Orchard/Environment/WorkContextModule.cs
index e9475bed3..89778a422 100644
--- a/src/Orchard/Environment/WorkContextModule.cs
+++ b/src/Orchard/Environment/WorkContextModule.cs
@@ -6,7 +6,6 @@ using System.Web;
 using Autofac;
 using Autofac.Builder;
 using Autofac.Core;
-using Autofac.Features.Metadata;
 using Module = Autofac.Module;
 
 namespace Orchard.Environment {
@@ -24,10 +23,6 @@ namespace Orchard.Environment {
                 .As<WorkContextProperty<HttpContextBase>>()
                 .InstancePerMatchingLifetimeScope("work");
 
-            builder.Register(ctx => ctx.Resolve<WorkContextProperty<HttpContextBase>>().Value)
-                .As<HttpContextBase>()
-                .InstancePerDependency();
-
             builder.RegisterGeneric(typeof(WorkValues<>))
                 .InstancePerMatchingLifetimeScope("work");
 
diff --git a/src/Orchard/Mvc/MvcModule.cs b/src/Orchard/Mvc/MvcModule.cs
index a5d831ea1..2da05b755 100644
--- a/src/Orchard/Mvc/MvcModule.cs
+++ b/src/Orchard/Mvc/MvcModule.cs
@@ -52,11 +52,6 @@ namespace Orchard.Mvc {
             var baseUrl = new Func<string>(() => siteService.GetSiteSettings().BaseUrl);
             var httpContextBase = new HttpContextPlaceholder(baseUrl);
 
-            if (httpContextBase == null) {
-                context.Resolve<IWorkContextAccessor>().CreateWorkContextScope();
-                return context.Resolve<IHttpContextAccessor>().Current();
-            }
-            
             context.Resolve<IWorkContextAccessor>().CreateWorkContextScope(httpContextBase);
             return httpContextBase;
         }