Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-03-11 17:27:30 +11:00
parent 2ecab70772 aed4c1faed
commit 59cdb8a6fe
3 changed files with 97 additions and 78 deletions
--- a/src/Umbraco.Web/Models/DynamicPublishedContent.cs
+++ b/src/Umbraco.Web/Models/DynamicPublishedContent.cs
@@ -332,7 +332,7 @@ namespace Umbraco.Web.Models

            var attempt = content.GetType().GetMemberIgnoreCase(content, alias);

-			return !attempt.Success
+			return attempt.Success == false || attempt.Result == null
 				? null
 				: new PropertyResult(alias, attempt.Result, PropertyResultType.ReflectedProperty);
 		}