From be83302b14693c8ed2f27a0885a4983c705222e0 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 18 Feb 2013 13:22:12 -0100 Subject: [PATCH] Fixes U4-1451 --- .../Models/DynamicPublishedContent.cs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web/Models/DynamicPublishedContent.cs b/src/Umbraco.Web/Models/DynamicPublishedContent.cs index aedd6a4226..861ffba9b1 100644 --- a/src/Umbraco.Web/Models/DynamicPublishedContent.cs +++ b/src/Umbraco.Web/Models/DynamicPublishedContent.cs @@ -296,14 +296,17 @@ namespace Umbraco.Web.Models } var context = this; var prop = GetPropertyInternal(alias, PublishedContent); - while (prop == null || !prop.HasValue()) - { - var parent = ((IPublishedContent) context).Parent; - if (parent == null) break; - prop = context.GetPropertyInternal(alias, context.PublishedContent); - //update context, fixes issue: http://issues.umbraco.org/issue/U4-1451 - context = parent.AsDynamicPublishedContent(); - } + + while (prop == null || !prop.HasValue()) + { + var parent = ((IPublishedContent)context).Parent; + if (parent == null) break; + + // Update the context before attempting to retrieve the property again. + context = parent.AsDynamicPublishedContent(); + prop = context.GetPropertyInternal(alias, context.PublishedContent); + } + return prop; }