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

ThemeService now finds first theme that is _enabled_ in priority list. If no theme exists or is enabled the SafeMode theme is selected.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Dave Reed
2010-10-19 13:34:39 -07:00
parent cb9c8e4f0f
commit cb17abd73a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs
View File

@@ -154,11 +154,11 @@ namespace Orchard.Themes.Services {
foreach (var theme in requestTheme) { foreach (var theme in requestTheme) {
var t = GetThemeByName(theme.ThemeName); var t = GetThemeByName(theme.ThemeName);
if (t != null) if (t != null && t.Enabled)
return t; return t;
} }
return null; return GetThemeByName("SafeMode");
} }
public ITheme GetThemeByName(string name) { public ITheme GetThemeByName(string name) {
@@ -221,7 +221,8 @@ namespace Orchard.Themes.Services {
} }
private bool IsThemeEnabled(ExtensionDescriptor descriptor) { private bool IsThemeEnabled(ExtensionDescriptor descriptor) {
return _shellDescriptorManager.GetShellDescriptor().Features.Any(sf => sf.Name == descriptor.Name); return (descriptor.Name == "TheAdmin" || descriptor.Name == "SafeMode") ||
_shellDescriptorManager.GetShellDescriptor().Features.Any(sf => sf.Name == descriptor.Name);
} }
private ITheme CreateTheme(ExtensionDescriptor descriptor) { private ITheme CreateTheme(ExtensionDescriptor descriptor) {