mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
Merge
--HG-- branch : dev
This commit is contained in:
@@ -75,8 +75,6 @@ namespace Orchard.Core.Routable.Drivers {
|
|||||||
updater.TryUpdateModel(model, Prefix, null, null);
|
updater.TryUpdateModel(model, Prefix, null, null);
|
||||||
part.Title = model.Title;
|
part.Title = model.Title;
|
||||||
part.Slug = model.Slug;
|
part.Slug = model.Slug;
|
||||||
|
|
||||||
// TEMP: path format patterns replaces this logic
|
|
||||||
part.Path = part.GetPathFromSlug(model.Slug);
|
part.Path = part.GetPathFromSlug(model.Slug);
|
||||||
|
|
||||||
if (!_routableService.IsSlugValid(part.Slug)) {
|
if (!_routableService.IsSlugValid(part.Slug)) {
|
||||||
@@ -89,6 +87,9 @@ namespace Orchard.Core.Routable.Drivers {
|
|||||||
originalSlug, part.Slug, part.ContentItem.ContentType));
|
originalSlug, part.Slug, part.ContentItem.ContentType));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TEMP: path format patterns replaces this logic
|
||||||
|
part.Path = part.GetPathFromSlug(part.Slug);
|
||||||
|
|
||||||
if (part.ContentItem.Id != 0 && model.PromoteToHomePage && _routableHomePageProvider != null) {
|
if (part.ContentItem.Id != 0 && model.PromoteToHomePage && _routableHomePageProvider != null) {
|
||||||
CurrentSite.HomePage = _routableHomePageProvider.GetSettingValue(part.ContentItem.Id);
|
CurrentSite.HomePage = _routableHomePageProvider.GetSettingValue(part.ContentItem.Id);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user