diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-11-21 17:15:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 17:15:36 -0500 |
| commit | bfe88d50576ef98d99890cde6dedf84d3cf9044f (patch) | |
| tree | e45797a21eaf7d5046cdab4bc362099512e24bae /MediaBrowser.Controller | |
| parent | 71ff88284be60fb39a7389e0c4990c94f2207ed4 (diff) | |
| parent | 77695f8abed3156de04c6bb2496c14a2ab3d90a8 (diff) | |
Merge pull request #3034 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/TV/Series.cs | 17 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Library/IUserManager.cs | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs index 1d09783d1..ccd0a7636 100644 --- a/MediaBrowser.Controller/Entities/TV/Series.cs +++ b/MediaBrowser.Controller/Entities/TV/Series.cs @@ -215,23 +215,6 @@ namespace MediaBrowser.Controller.Entities.TV return list; } - [IgnoreDataMember] - public bool ContainsEpisodesWithoutSeasonFolders - { - get - { - var children = Children; - foreach (var child in children) - { - if (child is Video) - { - return true; - } - } - return false; - } - } - public override List<BaseItem> GetChildren(User user, bool includeLinkedChildren) { return GetSeasons(user, new DtoOptions(true)); diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs index d4232c77e..03e1d352e 100644 --- a/MediaBrowser.Controller/Library/IUserManager.cs +++ b/MediaBrowser.Controller/Library/IUserManager.cs @@ -143,7 +143,7 @@ namespace MediaBrowser.Controller.Library /// <summary> /// Authenticates the user. /// </summary> - Task<User> AuthenticateUser(string username, string password, string passwordSha1, string passwordMd5, string remoteEndPoint); + Task<User> AuthenticateUser(string username, string password, string passwordSha1, string passwordMd5, string remoteEndPoint, bool isUserSession); /// <summary> /// Starts the forgot password process. |