Merge remote-tracking branch 'upstream/master' into api-upload-subtitle

1 files changed, 8 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index e5adf88d1..d25545a2f 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -18,12 +20,14 @@ namespace MediaBrowser.Controller.Entities
 {
     /// <summary>
     /// Specialized Folder class that points to a subset of the physical folders in the system.
-    /// It is created from the user-specific folders within the system root
+    /// It is created from the user-specific folders within the system root.
     /// </summary>
     public class CollectionFolder : Folder, ICollectionFolder
     {
         public static IXmlSerializer XmlSerializer { get; set; }
+
         public static IJsonSerializer JsonSerializer { get; set; }
+
         public static IServerApplicationHost ApplicationHost { get; set; }
 
         public CollectionFolder()
@@ -140,7 +144,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         /// <summary>
-        /// Allow different display preferences for each collection folder
+        /// Allow different display preferences for each collection folder.
         /// </summary>
         /// <value>The display prefs id.</value>
         [JsonIgnore]
@@ -155,6 +159,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         public string[] PhysicalLocationsList { get; set; }
+
         public Guid[] PhysicalFolderIds { get; set; }
 
         protected override FileSystemMetadata[] GetFileSystemChildren(IDirectoryService directoryService)
@@ -222,7 +227,7 @@ namespace MediaBrowser.Controller.Entities
                 return null;
             }
 
-            return (totalProgresses / foldersWithProgress);
+            return totalProgresses / foldersWithProgress;
         }
 
         protected override bool RefreshLinkedChildren(IEnumerable<FileSystemMetadata> fileSystemChildren)