From fe08e7fc2f0987fba14f72548edd605c11de3ea4 Mon Sep 17 00:00:00 2001
From: Morten Christensen <unknown@kiln.example.com>
Date: Thu, 7 Mar 2013 13:42:14 -0100
Subject: [PATCH] Fixes U4-1865 by excluding trashed items from GetByLevel
 method for both Content and Media

---
 src/Umbraco.Core/Services/ContentService.cs | 2 +-
 src/Umbraco.Core/Services/MediaService.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 9e9fef26be..fcd56259c7 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -194,7 +194,7 @@ namespace Umbraco.Core.Services
 		{
 			using (var repository = _repositoryFactory.CreateContentRepository(_uowProvider.GetUnitOfWork()))
 			{
-				var query = Query<IContent>.Builder.Where(x => x.Level == level);
+                var query = Query<IContent>.Builder.Where(x => x.Level == level && x.Path.Contains("-20") == false);
 				var contents = repository.GetByQuery(query);
 
 				return contents;
diff --git a/src/Umbraco.Core/Services/MediaService.cs b/src/Umbraco.Core/Services/MediaService.cs
index 362507f7c6..148b28ac8c 100644
--- a/src/Umbraco.Core/Services/MediaService.cs
+++ b/src/Umbraco.Core/Services/MediaService.cs
@@ -155,7 +155,7 @@ namespace Umbraco.Core.Services
         {
             using (var repository = _repositoryFactory.CreateMediaRepository(_uowProvider.GetUnitOfWork()))
             {
-                var query = Query<IMedia>.Builder.Where(x => x.Level == level);
+                var query = Query<IMedia>.Builder.Where(x => x.Level == level && x.Path.Contains("-21") == false);
                 var contents = repository.GetByQuery(query);
 
                 return contents;