Merge remote-tracking branch 'official/master'

1 files changed, 2 insertions, 8 deletions

diff --git a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
index 8e51e1d7d..fe4b16645 100644
--- a/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
+++ b/MediaBrowser.Server.Implementations/Collections/CollectionManager.cs
@@ -37,7 +37,7 @@ namespace MediaBrowser.Server.Implementations.Collections
 
         public Folder GetCollectionsFolder(string userId)
         {
-            return _libraryManager.RootFolder.Children.Concat(_libraryManager.RootFolder).OfType<ManualCollectionsFolder>()
+            return _libraryManager.RootFolder.Children.OfType<ManualCollectionsFolder>()
                 .FirstOrDefault();
         }
 
@@ -162,13 +162,7 @@ namespace MediaBrowser.Server.Implementations.Collections
                     throw new ArgumentException("Item already exists in collection");
                 }
 
-                list.Add(new LinkedChild
-                {
-                    ItemName = item.Name,
-                    ItemYear = item.ProductionYear,
-                    ItemType = item.GetType().Name,
-                    Type = LinkedChildType.Manual
-                });
+                list.Add(LinkedChild.Create(item));
 
                 var supportsGrouping = item as ISupportsBoxSetGrouping;