Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #2917 from sbwalker/dev

Browse Source 
fix null handling in stylesheet logic
This commit is contained in:
Shaun Walker
2023-06-21 08:47:39 -04:00
committed by GitHub
parent db2aa920e2 05b5d9da9b
commit 1e39f48235
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Server/Pages/_Host.cshtml.cs
View File

@ -172,7 +172,7 @@ namespace Oqtane.Pages
page.ThemeType = site.DefaultThemeType;
}
var theme = site.Themes.FirstOrDefault(item => item.Themes.Any(item => item.TypeName == page.ThemeType));
if (theme != null)
if (theme?.Resources != null)
{
resources.AddRange(theme.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet).ToList());
}
@ -180,7 +180,7 @@ namespace Oqtane.Pages
if (type != null)
{
var obj = Activator.CreateInstance(type) as IThemeControl;
if (obj.Resources != null)
if (obj?.Resources != null)
{
resources.AddRange(obj.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet).ToList());
}