Merge remote-tracking branch 'upstream/master' into docker

3 files changed, 10 insertions, 0 deletions

diff --git a/MediaBrowser.Model/Configuration/MetadataConfiguration.cs b/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
index 082c61c97..d1658e5d6 100644
--- a/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/MetadataConfiguration.cs
@@ -4,5 +4,10 @@ namespace MediaBrowser.Model.Configuration
     public class MetadataConfiguration
     {
         public bool UseFileCreationTimeForDateAdded { get; set; }
+
+        public MetadataConfiguration()
+        {
+            UseFileCreationTimeForDateAdded = true;
+        }
     }
 }
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 2e7dc2e40..230680ff2 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -180,6 +180,8 @@ namespace MediaBrowser.Model.Configuration
 
         public bool SaveMetadataHidden { get; set; }
 
+        public bool PlaylistImagesDeleted { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index c162e389b..ab0cb83c8 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -88,6 +88,8 @@ namespace MediaBrowser.Model.Configuration
 
         public AccessSchedule[] AccessSchedules { get; set; }
 
+        public bool EnableUserPreferenceAccess { get; set; }
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
         /// </summary>
@@ -112,6 +114,7 @@ namespace MediaBrowser.Model.Configuration
             SyncConnectImage = true;
             IncludeTrailersInSuggestions = true;
             EnableCinemaMode = true;
+            EnableUserPreferenceAccess = true;
 
             AccessSchedules = new AccessSchedule[] { };
         }