Merge branch 'v8/8.6' up into v8/dev

# Conflicts: # src/SolutionInfo.cs # src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
2020-02-24 15:11:58 +00:00
parent 4ca4d8e6e0 b41c3ad3bc
commit 4ed69d21a0
18 changed files with 394 additions and 53 deletions
--- a/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs
@@ -321,6 +321,15 @@ namespace Umbraco.Core.Services.Implement
            }
        }

+        public bool HasContainerInPath(params int[] ids)
+        {
+            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+            {
+                // can use same repo for both content and media
+                return Repository.HasContainerInPath(ids);
+            }
+        }
+
        public IEnumerable<TItem> GetDescendants(int id, bool andSelf)
        {
            using (var scope = ScopeProvider.CreateScope(autoComplete: true))