From c95b408d686bb16ede0793e58b9598755f447726 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 27 Sep 2012 16:31:24 -0700 Subject: [PATCH] #19048: Fixing potential NRE if DisplayName is defined to null Work Item: 19048 --HG-- branch : 1.x --- src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml b/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml index 70debb678..e427faea2 100644 --- a/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml @@ -1,5 +1,9 @@ +@using Orchard.ContentManagement +@using Orchard.Utility.Extensions + @{ - var typeDisplayName = Model.ContentItem.TypeDefinition.DisplayName; + ContentItem contentItem = Model.ContentItem; + var typeDisplayName = contentItem.TypeDefinition.DisplayName ?? contentItem.ContentType.CamelFriendly(); var pageTitle = T("New {0}", typeDisplayName); Layout.Title = (string)pageTitle.Text;