From cfcfb75dcccbb209b4b3172cdb9bb4c441535bb4 Mon Sep 17 00:00:00 2001 From: leekelleher Date: Tue, 12 Nov 2013 21:26:21 +0000 Subject: [PATCH] Fixes: U4-3051 GetAncestorOrSelfDocuments gets stuck in infinite loop --- .../umbraco.presentation/umbraco/uQuery/DocumentExtensions.cs | 2 +- .../umbraco.presentation/umbraco/uQuery/MediaExtensions.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/DocumentExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/DocumentExtensions.cs index b89fddf8a4..7a59d874bd 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/DocumentExtensions.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/DocumentExtensions.cs @@ -33,7 +33,7 @@ namespace umbraco public static IEnumerable GetAncestorDocuments(this Document document) { var ancestor = uQuery.GetDocument(document.ParentId); - while (ancestor != null) + while (ancestor != null && ancestor.Id != -1) { yield return ancestor; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs index b0a7db8550..f52100d9c9 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs @@ -21,7 +21,7 @@ namespace umbraco { var ancestor = new Media(media.Parent.Id); - while (ancestor != null) + while (ancestor != null && ancestor.Id != -1) { yield return ancestor;