From 4b595690130e9fb472f42d1dbfad6c6e4a3042dd Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastienros@gmail.com>
Date: Wed, 26 Aug 2015 17:17:49 -0700
Subject: [PATCH] #5490 Fixing HttpRequestBase
 DependenciesShouldBeUpgradedFirst

Fixes #5490
---
 src/Orchard/Mvc/MvcModule.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Orchard/Mvc/MvcModule.cs b/src/Orchard/Mvc/MvcModule.cs
index a10474b24..0bcd1c9a5 100644
--- a/src/Orchard/Mvc/MvcModule.cs
+++ b/src/Orchard/Mvc/MvcModule.cs
@@ -53,6 +53,12 @@ namespace Orchard.Mvc {
             // thus preventing a StackOverflowException.
             var baseUrl = new Func<string>(() => siteService.GetSiteSettings().BaseUrl);
             var httpContextBase = context.Resolve<IHttpContextAccessor>().Current();
+
+            if (httpContextBase == null) {
+                context.Resolve<IWorkContextAccessor>().CreateWorkContextScope();
+                return context.Resolve<IHttpContextAccessor>().Current();
+            }
+            
             context.Resolve<IWorkContextAccessor>().CreateWorkContextScope(httpContextBase);
             return httpContextBase;
         }