Fix described in #263 - null reference exception when the user logs o…

…ff of their account when using Canonical, MetaRobots, or Title HTML helpers. Added a guard to check whether the current node is null to the templates.
maartenba · Jan 7, 2014 · b6d2e4b · b6d2e4b
1 parent 05113e8
commit b6d2e4b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/...MvcSiteMapProvider/MvcSiteMapProvider/Web/Html/DisplayTemplates/CanonicalHelperModel.ascx b/...MvcSiteMapProvider/MvcSiteMapProvider/Web/Html/DisplayTemplates/CanonicalHelperModel.ascx
@@ -2,6 +2,6 @@
 <%@ Import Namespace="System.Web.Mvc.Html" %>
 <%@ Import Namespace="MvcSiteMapProvider.Web.Html.Models" %>
 
-<% if (!String.IsNullOrEmpty(Model.CurrentNode.CanonicalUrl)) { %>
+<% if (Model.CurrentNode != null && !String.IsNullOrEmpty(Model.CurrentNode.CanonicalUrl)) { %>
     <link rel="canonical" href="<%=Model.CurrentNode.CanonicalUrl%>" />
 <% } %>
diff --git a/...cSiteMapProvider/MvcSiteMapProvider/Web/Html/DisplayTemplates/CanonicalHelperModel.cshtml b/...cSiteMapProvider/MvcSiteMapProvider/Web/Html/DisplayTemplates/CanonicalHelperModel.cshtml
@@ -2,6 +2,6 @@
 @using System.Web.Mvc.Html
 @using MvcSiteMapProvider.Web.Html.Models
 
-@if (!String.IsNullOrEmpty(Model.CurrentNode.CanonicalUrl)) {
+@if (Model.CurrentNode != null && !String.IsNullOrEmpty(Model.CurrentNode.CanonicalUrl)) {
     <link rel="canonical" href="@Model.CurrentNode.CanonicalUrl" />
 }
diff --git a/...vcSiteMapProvider/MvcSiteMapProvider/Web/Html/DisplayTemplates/MetaRobotsHelperModel.ascx b/...vcSiteMapProvider/MvcSiteMapProvider/Web/Html/DisplayTemplates/MetaRobotsHelperModel.ascx
@@ -2,6 +2,6 @@
 <%@ Import Namespace="System.Web.Mvc.Html" %>
 <%@ Import Namespace="MvcSiteMapProvider.Web.Html.Models" %>
 
-<% if (!String.IsNullOrEmpty(Model.CurrentNode.MetaRobotsContent)) { %>
+<% if (Model.CurrentNode != null && !String.IsNullOrEmpty(Model.CurrentNode.MetaRobotsContent)) { %>
     <meta name="robots" content="<%=Model.CurrentNode.MetaRobotsContent%>" />
 <% } %>
diff --git a/...SiteMapProvider/MvcSiteMapProvider/Web/Html/DisplayTemplates/MetaRobotsHelperModel.cshtml b/...SiteMapProvider/MvcSiteMapProvider/Web/Html/DisplayTemplates/MetaRobotsHelperModel.cshtml
@@ -2,6 +2,6 @@
 @using System.Web.Mvc.Html
 @using MvcSiteMapProvider.Web.Html.Models
 
-@if (!String.IsNullOrEmpty(Model.CurrentNode.MetaRobotsContent)) {
+@if (Model.CurrentNode != null && !String.IsNullOrEmpty(Model.CurrentNode.MetaRobotsContent)) {
     <meta name="robots" content="@Model.CurrentNode.MetaRobotsContent" />
 }
diff --git a/...SiteMapProvider/MvcSiteMapProvider/Web/Html/DisplayTemplates/SiteMapTitleHelperModel.ascx b/...SiteMapProvider/MvcSiteMapProvider/Web/Html/DisplayTemplates/SiteMapTitleHelperModel.ascx
@@ -2,4 +2,6 @@
 <%@ Import Namespace="System.Web.Mvc.Html" %>
 <%@ Import Namespace="MvcSiteMapProvider.Web.Html.Models" %>
 
-<%=Model.CurrentNode.Title%>
+<% if (Model.CurrentNode != null) { %>
+<%=Model.CurrentNode.Title%>
+<% } %>
diff --git a/...teMapProvider/MvcSiteMapProvider/Web/Html/DisplayTemplates/SiteMapTitleHelperModel.cshtml b/...teMapProvider/MvcSiteMapProvider/Web/Html/DisplayTemplates/SiteMapTitleHelperModel.cshtml
@@ -2,4 +2,4 @@
 @using System.Web.Mvc.Html
 @using MvcSiteMapProvider.Web.Html.Models
 
-@Model.CurrentNode.Title
+@if (Model.CurrentNode != null) {Model.CurrentNode.Title;}