From a11d9247365a5549f42f4d4119702bbad8a9a828 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sat, 26 Jan 2013 15:50:53 -0100 Subject: [PATCH] Fixes U4-1553 - YSOD when umbracoUrlName value is null --- src/Umbraco.Core/Models/ContentExtensions.cs | 3 ++- src/umbraco.cms/businesslogic/web/Document.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/Models/ContentExtensions.cs b/src/Umbraco.Core/Models/ContentExtensions.cs index 40c5d6110a..8b65a1d3a5 100644 --- a/src/Umbraco.Core/Models/ContentExtensions.cs +++ b/src/Umbraco.Core/Models/ContentExtensions.cs @@ -405,7 +405,8 @@ namespace Umbraco.Core.Models xml.Add(property.ToXml()); //Check for umbracoUrlName convention - if (property.Alias == "umbracoUrlName" && property.Value.ToString().Trim() != string.Empty) + if (property.Alias == "umbracoUrlName" && property.Value != null && + property.Value.ToString().Trim() != string.Empty) xml.SetAttributeValue("urlName", property.Value); } diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs index d1d2b35650..92f9defa4e 100644 --- a/src/umbraco.cms/businesslogic/web/Document.cs +++ b/src/umbraco.cms/businesslogic/web/Document.cs @@ -1237,7 +1237,8 @@ namespace umbraco.cms.businesslogic.web if (p != null) { x.AppendChild(p.ToXml(xd)); - if (p.PropertyType.Alias == "umbracoUrlName" && p.Value.ToString().Trim() != string.Empty) + if (p.PropertyType.Alias == "umbracoUrlName" && p.Value != null + && p.Value.ToString().Trim() != string.Empty) urlName = p.Value.ToString(); }