updated nuget

This commit is contained in:
Luke Pulverenti
2014-12-02 22:13:03 -05:00
parent c48458f215
commit 56f6b0335c
52 changed files with 498 additions and 746 deletions

View File

@@ -59,7 +59,7 @@ namespace MediaBrowser.Server.Implementations.Intros
}
var ratingLevel = string.IsNullOrWhiteSpace(item.OfficialRating)
? (int?)null
? null
: _localization.GetRatingLevel(item.OfficialRating);
var libaryItems = user.RootFolder.GetRecursiveChildren(user, false)
@@ -134,15 +134,6 @@ namespace MediaBrowser.Server.Implementations.Intros
WatchingItem = item,
Random = random
}));
candidates.AddRange(libaryItems.Where(i => i is Trailer).Select(i => new ItemWithTrailer
{
Item = i,
Type = ItemWithTrailerType.LibraryTrailer,
User = user,
WatchingItem = item,
Random = random
}));
}
var customIntros = !string.IsNullOrWhiteSpace(config.CustomIntroPath) ?