Fixes descendant queries to ensure that the comma is suffixed to the path, otherwise strange things could happen when there are longer ids!

Shazwazza · Shazwazza · commit 646e5f173d81 · 2014-10-08T17:23:14.000+11:00
diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
@@ -500,7 +500,8 @@ public IEnumerable<IContent> GetDescendants(IContent content)
         {
             using (var repository = _repositoryFactory.CreateContentRepository(_uowProvider.GetUnitOfWork()))
             {
-                var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(content.Path) && x.Id != content.Id);
+                var pathMatch = content.Path + ",";
+                var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(pathMatch) && x.Id != content.Id);
                 var contents = repository.GetByQuery(query);
 
                 return contents;
diff --git a/src/Umbraco.Core/Services/EntityService.cs b/src/Umbraco.Core/Services/EntityService.cs
@@ -252,7 +252,8 @@ public virtual IEnumerable<IUmbracoEntity> GetDescendents(int id)
             using (var repository = _repositoryFactory.CreateEntityRepository(_uowProvider.GetUnitOfWork()))
             {
                 var entity = repository.Get(id);
-                var query = Query<IUmbracoEntity>.Builder.Where(x => x.Path.StartsWith(entity.Path) && x.Id != id);
+                var pathMatch = entity.Path + ",";
+                var query = Query<IUmbracoEntity>.Builder.Where(x => x.Path.StartsWith(pathMatch) && x.Id != id);
                 var entities = repository.GetByQuery(query);
 
                 return entities;
diff --git a/src/Umbraco.Core/Services/MediaService.cs b/src/Umbraco.Core/Services/MediaService.cs
@@ -419,7 +419,8 @@ public IEnumerable<IMedia> GetDescendants(IMedia media)
             var uow = _uowProvider.GetUnitOfWork();
             using (var repository = _repositoryFactory.CreateMediaRepository(uow))
             {
-                var query = Query<IMedia>.Builder.Where(x => x.Path.StartsWith(media.Path) && x.Id != media.Id);
+                var pathMatch = media.Path + ",";
+                var query = Query<IMedia>.Builder.Where(x => x.Path.StartsWith(pathMatch) && x.Id != media.Id);
                 var medias = repository.GetByQuery(query);
 
                 return medias;

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,8 @@ public IEnumerable<IContent> GetDescendants(IContent content)`
`500`	`500`	`{`
`501`	`501`	`using (var repository = _repositoryFactory.CreateContentRepository(_uowProvider.GetUnitOfWork()))`
`502`	`502`	`{`
`503`		`- var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(content.Path) && x.Id != content.Id);`
	`503`	`+ var pathMatch = content.Path + ",";`
	`504`	`+ var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(pathMatch) && x.Id != content.Id);`
`504`	`505`	`var contents = repository.GetByQuery(query);`
`505`	`506`
`506`	`507`	`return contents;`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,8 @@ public virtual IEnumerable<IUmbracoEntity> GetDescendents(int id)`
`252`	`252`	`using (var repository = _repositoryFactory.CreateEntityRepository(_uowProvider.GetUnitOfWork()))`
`253`	`253`	`{`
`254`	`254`	`var entity = repository.Get(id);`
`255`		`- var query = Query<IUmbracoEntity>.Builder.Where(x => x.Path.StartsWith(entity.Path) && x.Id != id);`
	`255`	`+ var pathMatch = entity.Path + ",";`
	`256`	`+ var query = Query<IUmbracoEntity>.Builder.Where(x => x.Path.StartsWith(pathMatch) && x.Id != id);`
`256`	`257`	`var entities = repository.GetByQuery(query);`
`257`	`258`
`258`	`259`	`return entities;`
Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,8 @@ public IEnumerable<IMedia> GetDescendants(IMedia media)`
`419`	`419`	`var uow = _uowProvider.GetUnitOfWork();`
`420`	`420`	`using (var repository = _repositoryFactory.CreateMediaRepository(uow))`
`421`	`421`	`{`
`422`		`- var query = Query<IMedia>.Builder.Where(x => x.Path.StartsWith(media.Path) && x.Id != media.Id);`
	`422`	`+ var pathMatch = media.Path + ",";`
	`423`	`+ var query = Query<IMedia>.Builder.Where(x => x.Path.StartsWith(pathMatch) && x.Id != media.Id);`
`423`	`424`	`var medias = repository.GetByQuery(query);`
`424`	`425`
`425`	`426`	`return medias;`