Merge with 4.10.0

This commit is contained in:
Morten@Thinkpad-X220
2012-10-04 05:18:12 -02:00
52 changed files with 2507 additions and 1727 deletions

View File

@@ -27,6 +27,21 @@ namespace Umbraco.Web
return GetUmbracoMedia(nodeId);
}
public IEnumerable<IPublishedContent> GetRootDocuments(UmbracoContext umbracoContext)
{
var rootMedia = global::umbraco.cms.businesslogic.media.Media.GetRootMedias();
var result = new List<IPublishedContent>();
//TODO: need to get a ConvertFromMedia method but we'll just use this for now.
foreach (var media in rootMedia
.Select(m => global::umbraco.library.GetMedia(m.Id, true))
.Where(media => media != null && media.Current != null))
{
media.MoveNext();
result.Add(ConvertFromXPathNavigator(media.Current));
}
return result;
}
private IPublishedContent GetUmbracoMedia(int id)
{