lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Making sure the nearest defined zones in the theme/basetheme chain are considered as the zones for the theme in question.

Browse Source 
work item: 17575

--HG--
branch : 1.x
This commit is contained in:
Nathan Heskew
2011-03-29 15:28:14 -07:00
parent e1b24f8678
commit 75f51b52fc
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Orchard.Web/Modules/Orchard.Widgets/Services/WidgetsService.cs
View File

@@ -72,12 +72,15 @@ namespace Orchard.Widgets.Services {
.Select(x => x.Trim())
.ToList();
// add the zones for the base theme
if (!string.IsNullOrWhiteSpace(theme.BaseTheme)) {
// if this theme has no zones defined then walk the BaseTheme chain until we hit a theme which defines zones
while (zones.Count() == 0 && theme != null && !string.IsNullOrWhiteSpace(theme.BaseTheme)) {
string baseTheme = theme.BaseTheme;
theme = _extensionManager.GetExtension(baseTheme);
if (theme != null)
zones.Concat(GetZones(theme).Where(z => !zones.Contains(z)));
if (theme != null && theme.Zones != null)
zones = theme.Zones.Split(',')
.Distinct()
.Select(x => x.Trim())
.ToList();
}
return zones;