From 88e6e44f4e3b9aa04d564f0e759f9863d29fec95 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 28 Feb 2018 15:54:13 +0100 Subject: [PATCH] Fixes Content Picker 2 can search outside of it's selected start node --- src/Umbraco.Web/Search/UmbracoTreeSearcher.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs index 0dac79590f..38347de9ed 100644 --- a/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs +++ b/src/Umbraco.Web/Search/UmbracoTreeSearcher.cs @@ -208,6 +208,10 @@ namespace Umbraco.Web.Search if (sb == null) throw new ArgumentNullException("sb"); if (entityService == null) throw new ArgumentNullException("entityService"); + Udi udi; + Udi.TryParse(searchFrom, true, out udi); + searchFrom = udi == null ? searchFrom : entityService.GetIdForUdi(udi).Result.ToString(); + int searchFromId; var entityPath = int.TryParse(searchFrom, out searchFromId) && searchFromId > 0 ? entityService.GetAllPaths(objectType, searchFromId).FirstOrDefault() @@ -332,4 +336,4 @@ namespace Umbraco.Web.Search } } -} \ No newline at end of file +}