Merge branch '1.9.x' into dev

src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs

@@ -82,9 +82,10 @@ namespace Orchard.Blogs {
                     .WithPart("CommonPart")
                     .WithPart("WidgetPart")
                     .WithSetting("Stereotype", "Widget")
+                    .WithPart("IdentityPart")
                 );
 
-            return 6;
+            return 7;
         }
 
         public int UpdateFrom1() {
@@ -131,5 +132,14 @@ namespace Orchard.Blogs {
 
             return 6;
         }
+
+        public int UpdateFrom6() {
+            ContentDefinitionManager.AlterTypeDefinition("BlogArchives",
+                cfg => cfg
+                    .WithPart("IdentityPart")
+                );
+
+           return 7;
+       }
     }
 }

src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs

@@ -273,5 +273,14 @@ namespace Orchard.Projections {
 
             return 3;
         }
+
+        public int UpdateFrom3() {
+            ContentDefinitionManager.AlterTypeDefinition("NavigationQueryMenuItem",
+                cfg => cfg
+                    .WithPart("IdentityPart")
+                );
+
+            return 4;
+        }
     }
 }

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;
         }