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

Patches via GPLwhite => Work items: 30057

Browse Source
This commit is contained in:
hartvig
2011-02-22 13:30:20 -01:00
parent d54b2416f0
commit 9196c039d1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
umbraco/presentation/macro.cs
View File

@@ -1143,7 +1143,7 @@ namespace umbraco
MacroPropertyModel propModel = model.Properties.Find(m => m.Key == propertyAlias.ToLower());
// zb-00037 #29875 : values have already been parsed + no need to parse ""
object propValue = prop != null ? propModel.Value : "";
object propValue = propModel != null && prop != null ? propModel.Value : "";
// Special case for types of webControls.unit
if (prop.PropertyType == typeof(Unit))
propValue = Unit.Parse(propValue.ToString());