lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '1.9.x' into dev

Browse Source
This commit is contained in:
Lombiq
2015-11-30 22:58:33 +01:00
parent fa0c93724e c2dd09af5e
commit 408534c915
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
View File

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

9
src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs
View File

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

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

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