From 1d5f1bc474c3d685e04f409b956ccc431cd05ee5 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 20 Jan 2015 00:19:13 -0500
Subject: sync updates

---
 MediaBrowser.Model/Users/UserPolicy.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Model/Users')

diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index eb8dbc6f0b..cdc5077b02 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -54,6 +54,9 @@ namespace MediaBrowser.Model.Users
 
         public string[] EnabledChannels { get; set; }
         public bool EnableAllChannels { get; set; }
+
+        public string[] EnabledFolders { get; set; }
+        public bool EnableAllFolders { get; set; }
         
         public UserPolicy()
         {
@@ -62,9 +65,6 @@ namespace MediaBrowser.Model.Users
             EnableLiveTvAccess = true;
             EnableSharedDeviceControl = true;
 
-            EnabledChannels = new string[] { };
-            
-            BlockedMediaFolders = new string[] { };
             BlockedTags = new string[] { };
             BlockUnratedItems = new UnratedItem[] { };
 
@@ -72,6 +72,12 @@ namespace MediaBrowser.Model.Users
 
             AccessSchedules = new AccessSchedule[] { };
 
+            EnableAllChannels = true;
+            EnabledChannels = new string[] { };
+
+            EnableAllFolders = true;
+            EnabledFolders = new string[] { };
+
             EnabledDevices = new string[] { };
             EnableAllDevices = true;
         }
-- 
cgit v1.2.3