From 14f3bb6b19dbfec028086e2c0ced90979bccc939 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 29 Dec 2015 11:22:30 -0500
Subject: [PATCH] update channels

---
 MediaBrowser.Model/Configuration/UserConfiguration.cs |  5 -----
 .../Library/UserViewManager.cs                        | 11 +----------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 278d22cfb4..ab3a861a36 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -29,8 +29,6 @@ namespace MediaBrowser.Model.Configuration
 
         public bool GroupMoviesIntoBoxSets { get; set; }
 
-        public string[] DisplayChannelsWithinViews { get; set; }
-
         public string[] ExcludeFoldersFromGrouping { get; set; }
         public string[] GroupedFolders { get; set; }
 
@@ -50,7 +48,6 @@ namespace MediaBrowser.Model.Configuration
         public string[] PlainFolderViews { get; set; }
 
         public bool HidePlayedInLatest { get; set; }
-        public bool DisplayChannelsInline { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
@@ -62,8 +59,6 @@ namespace MediaBrowser.Model.Configuration
 
             LatestItemsExcludes = new string[] { };
             OrderedViews = new string[] { };
-            DisplayChannelsWithinViews = new string[] { };
-            DisplayChannelsInline = true;
 
             PlainFolderViews = new string[] { };
 
diff --git a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
index aca13e0888..63d1d4cb88 100644
--- a/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserViewManager.cs
@@ -124,16 +124,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
                 var channels = channelResult.Items;
 
-                var embeddedChannels = channels
-                    .Where(i => user.Configuration.DisplayChannelsInline || user.Configuration.DisplayChannelsWithinViews.Contains(i.Id.ToString("N")))
-                    .ToList();
-
-                list.AddRange(embeddedChannels);
-
-                if (channels.Length > embeddedChannels.Count)
-                {
-                    list.Add(await _channelManager.GetInternalChannelFolder(cancellationToken).ConfigureAwait(false));
-                }
+                list.AddRange(channels);
 
                 if (_liveTvManager.GetEnabledUsers().Select(i => i.Id.ToString("N")).Contains(query.UserId))
                 {