From 5b53671a2a76493f0fa141653fa52f65980161a5 Mon Sep 17 00:00:00 2001
From: Thierry Fleury <thierry@codinlab.fr>
Date: Sun, 29 Nov 2015 18:03:58 +0100
Subject: [PATCH 1/2] Revert "Removing unnecessary resolution"

This reverts commit 9b91b1b2609439bb50dfc0321e72e5f39a95022f.
---
 src/Orchard/Mvc/MvcModule.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Orchard/Mvc/MvcModule.cs b/src/Orchard/Mvc/MvcModule.cs
index 33cc7176d..ab317a596 100644
--- a/src/Orchard/Mvc/MvcModule.cs
+++ b/src/Orchard/Mvc/MvcModule.cs
@@ -57,6 +57,7 @@ namespace Orchard.Mvc {
             var baseUrl = new Func<string>(() => siteService.GetSiteSettings().BaseUrl);
             var httpContextBase = new HttpContextPlaceholder(baseUrl);
 
+            context.Resolve<IWorkContextAccessor>().CreateWorkContextScope(httpContextBase);
             return httpContextBase;
         }
 

From c2dd09af5e04216eadc3e4c9e20880e12fae2e17 Mon Sep 17 00:00:00 2001
From: Lombiq <registrator@lombiq.com>
Date: Mon, 30 Nov 2015 22:50:19 +0100
Subject: [PATCH 2/2] Fixing that NavigationQueryMenuItems and BlogArchives
 widgets couldn't be export/imported due to the lack of an identity, fixes
 #3488.

Since the Projections migrations is already kind of a mess
---
 src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs  | 12 +++++++++++-
 .../Modules/Orchard.Projections/Migrations.cs        |  9 +++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
index 293b3bef0..b89cae08e 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
@@ -84,9 +84,10 @@ namespace Orchard.Blogs {
                     .WithPart("CommonPart")
                     .WithPart("WidgetPart")
                     .WithSetting("Stereotype", "Widget")
+                    .WithPart("IdentityPart")
                 );
 
-            return 6;
+            return 7;
         }
 
         public int UpdateFrom1() {
@@ -133,5 +134,14 @@ namespace Orchard.Blogs {
 
             return 6;
         }
+
+        public int UpdateFrom6() {
+            ContentDefinitionManager.AlterTypeDefinition("BlogArchives",
+                cfg => cfg
+                    .WithPart("IdentityPart")
+                );
+
+           return 7;
+       }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs
index 8ee643ce6..51d95faf3 100644
--- a/src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs
@@ -274,5 +274,14 @@ namespace Orchard.Projections {
 
             return 3;
         }
+
+        public int UpdateFrom3() {
+            ContentDefinitionManager.AlterTypeDefinition("NavigationQueryMenuItem",
+                cfg => cfg
+                    .WithPart("IdentityPart")
+                );
+
+            return 4;
+        }
     }
 }
\ No newline at end of file