aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Channels
diff options
context:
space:
mode:
authorJoshua M. Boniface <joshua@boniface.me>2019-10-27 13:52:08 -0400
committerGitHub <noreply@github.com>2019-10-27 13:52:08 -0400
commit53ee78170ad3d5d5d0ecac2dbe8dcbfb13940e46 (patch)
tree1ad4126058814609352d41b78662fd5838d6677a /MediaBrowser.Controller/Channels
parent2cdf5c203a9335100b19b9609a738e1b64d6631d (diff)
parentc9f4a74af02e08b895cd6a8b8a408b1c0edfb6c4 (diff)
Merge branch 'master' into copr-fix
Diffstat (limited to 'MediaBrowser.Controller/Channels')
-rw-r--r--MediaBrowser.Controller/Channels/Channel.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/Channels/Channel.cs b/MediaBrowser.Controller/Channels/Channel.cs
index 89159973b8..cdf2ca69e6 100644
--- a/MediaBrowser.Controller/Channels/Channel.cs
+++ b/MediaBrowser.Controller/Channels/Channel.cs
@@ -1,11 +1,11 @@
using System;
using System.Globalization;
using System.Linq;
+using System.Text.Json.Serialization;
using System.Threading;
using MediaBrowser.Common.Progress;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Querying;
-using MediaBrowser.Model.Serialization;
namespace MediaBrowser.Controller.Channels
{
@@ -31,10 +31,10 @@ namespace MediaBrowser.Controller.Channels
return base.IsVisible(user);
}
- [IgnoreDataMember]
+ [JsonIgnore]
public override bool SupportsInheritedParentImages => false;
- [IgnoreDataMember]
+ [JsonIgnore]
public override SourceType SourceType => SourceType.Channel;
protected override QueryResult<BaseItem> GetItemsInternal(InternalItemsQuery query)