aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-05-18 17:48:47 -0400
committerLuke <luke.pulverenti@gmail.com>2016-05-18 17:48:47 -0400
commit8023ae615b4f070e0fd3cc5e159c3abffaddc6bb (patch)
tree3f691e2e02fff647c7a80f93416acf0dbb489822 /MediaBrowser.Controller
parent03981715149a4967705269c9da0c2bece9cbd30e (diff)
parent34d4e4317aa9cd3e354ada10defb1ac1f142bf9f (diff)
Merge pull request #1746 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Entities/User.cs9
1 files changed, 1 insertions, 8 deletions
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index e5b39003d..5c68308f5 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -305,14 +305,7 @@ namespace MediaBrowser.Controller.Entities
public bool IsFolderGrouped(Guid id)
{
- var config = Configuration;
-
- if (config.ExcludeFoldersFromGrouping != null)
- {
- return !config.ExcludeFoldersFromGrouping.Select(i => new Guid(i)).Contains(id);
- }
-
- return config.GroupedFolders.Select(i => new Guid(i)).Contains(id);
+ return Configuration.GroupedFolders.Select(i => new Guid(i)).Contains(id);
}
[IgnoreDataMember]