diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-01-20 00:19:13 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-01-20 00:19:13 -0500 |
| commit | 1d5f1bc474c3d685e04f409b956ccc431cd05ee5 (patch) | |
| tree | 85eb6e1a2292d580456f1eaf79052ae4f3a6555e /MediaBrowser.Controller | |
| parent | 4ea72584dbba2a425daeb20d8afcbae720f22269 (diff) | |
sync updates
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 2761aa5d7..8faab4c36 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -303,10 +303,7 @@ namespace MediaBrowser.Controller.Entities { if (this is ICollectionFolder) { - if (user.Policy.BlockedMediaFolders.Contains(Id.ToString("N"), StringComparer.OrdinalIgnoreCase) || - - // Backwards compatibility - user.Policy.BlockedMediaFolders.Contains(Name, StringComparer.OrdinalIgnoreCase)) + if (!user.Policy.EnableAllFolders && !user.Policy.EnabledFolders.Contains(Id.ToString("N"), StringComparer.OrdinalIgnoreCase)) { return false; } |