yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes null check with setting master template

Browse Source
This commit is contained in:
Shannon
2016-12-29 14:02:15 +11:00
parent ac087a87d3
commit 436875e8ec
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web/Editors/TemplateController.cs
View File

@@ -98,11 +98,13 @@ namespace Umbraco.Web.Editors
if (changeMaster)
{
ITemplate master = null;
if (string.IsNullOrEmpty(display.MasterTemplateAlias) == false)
{
master = Services.FileService.GetTemplate(display.MasterTemplateAlias);
template.SetMasterTemplate(master);
var master = Services.FileService.GetTemplate(display.MasterTemplateAlias);
if (master != null)
{
template.SetMasterTemplate(master);
}
}
}