yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes broken merge

Browse Source
This commit is contained in:
perploug
2013-11-20 13:41:31 +01:00
parent b80b2475e0
commit 2cb4b207dc
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Web/WebApi/Filters/FilterAllowedOutgoingMediaAttribute.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
@@ -74,18 +74,19 @@ namespace Umbraco.Web.WebApi.Filters
internal void FilterBasedOnStartNode(IList items, IUser user)
{
if (items.Count > 0)
var toRemove = new List<dynamic>();
foreach (dynamic item in items)
{
var hasPathAccess = (item != null && UserExtensions.HasPathAccess(item.Path, user.StartContentId, Constants.System.RecycleBinContent));
var hasPathAccess = (item != null && UserExtensions.HasPathAccess(item.Path, user.StartMediaId, Constants.System.RecycleBinMedia));
if (!hasPathAccess)
{
toRemove.Add(item);
toRemove.Add(item);
}
}
foreach (var item in toRemove)
{
items.Remove(item);
}
foreach (var item in toRemove)
{
items.Remove(item);
}
}