lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#19714: Fixing possible NRE in MenuItemLink shape

Browse Source 
Work Item: 19714

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2013-05-20 16:22:04 -07:00
parent 2727da22c9
commit 633bed1677
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Core/Shapes/CoreShapes.cs
View File

@@ -104,9 +104,11 @@ namespace Orchard.Core.Shapes {
var menu = menuItem.Menu;
menuItem.Metadata.Alternates.Add("MenuItemLink__" + EncodeAlternateElement(menu.MenuName));
var contentType = ((IContent)menuItem.Content).ContentItem.ContentType;
if(contentType != null) {
menuItem.Metadata.Alternates.Add("MenuItemLink__" + contentType);
if (menuItem.Content != null) {
var contentType = ((IContent) menuItem.Content).ContentItem.ContentType;
if (contentType != null) {
menuItem.Metadata.Alternates.Add("MenuItemLink__" + contentType);
}
}
});