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

Merge branch 'temp8' of https://github.com/StefanoChiodino/Umbraco-CMS into temp8-pr3583

Browse Source
This commit is contained in:
Stephan
2019-01-10 16:29:36 +01:00
parent 4700d8a69c e2455b14d9
commit ed7c8da81f
29 changed files with 130 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web/Routing/PublishedRouter.cs
View File

@@ -755,9 +755,9 @@ namespace Umbraco.Web.Routing
}
}
private ITemplate GetTemplateModel(int templateId)
private ITemplate GetTemplateModel(int? templateId)
{
if (templateId <= 0)
if (templateId.HasValue == false)
{
_logger.Debug<PublishedRouter>("GetTemplateModel: No template.");
return null;
@@ -765,7 +765,10 @@ namespace Umbraco.Web.Routing
_logger.Debug<PublishedRouter>("GetTemplateModel: Get template id={TemplateId}", templateId);
var template = _services.FileService.GetTemplate(templateId);
if (templateId == null)
throw new InvalidOperationException("The template is not set, the page cannot render.");
var template = _services.FileService.GetTemplate(templateId.Value);
if (template == null)
throw new InvalidOperationException("The template with Id " + templateId + " does not exist, the page cannot render.");
_logger.Debug<PublishedRouter>("GetTemplateModel: Got template id={TemplateId} alias={TemplateAlias}", template.Id, template.Alias);