aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Library/UserManager.cs
diff options
context:
space:
mode:
authorMichalis Adamidis <gsnerf@gsnerf.de>2014-09-15 02:20:45 +0200
committerMichalis Adamidis <gsnerf@gsnerf.de>2014-09-15 02:20:45 +0200
commit671d302a92f79ec9c65dbae9c46a342038bfee96 (patch)
tree4b48ad27a1f01dff2e2e07aef8975fed2cb6d71e /MediaBrowser.Server.Implementations/Library/UserManager.cs
parent7690608ed578d3c1dbf3849122107af503855a81 (diff)
parent6babe4f5103c83d75da1924027f6e13aea165085 (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/UserManager.cs')
-rw-r--r--MediaBrowser.Server.Implementations/Library/UserManager.cs9
1 files changed, 6 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 47d6b17f0..16a1dc516 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -86,7 +86,7 @@ namespace MediaBrowser.Server.Implementations.Library
/// </summary>
public event EventHandler<GenericEventArgs<User>> UserUpdated;
public event EventHandler<GenericEventArgs<User>> UserConfigurationUpdated;
-
+
/// <summary>
/// Called when [user updated].
/// </summary>
@@ -137,7 +137,7 @@ namespace MediaBrowser.Server.Implementations.Library
{
return GetUserById(new Guid(id));
}
-
+
public async Task Initialize()
{
Users = await LoadUsers().ConfigureAwait(false);
@@ -260,7 +260,10 @@ namespace MediaBrowser.Server.Implementations.Library
HasConfiguredPassword = hasConfiguredDefaultPassword,
LastActivityDate = user.LastActivityDate,
LastLoginDate = user.LastLoginDate,
- Configuration = user.Configuration
+ Configuration = user.Configuration,
+ ConnectLinkType = user.ConnectLinkType,
+ ConnectUserId = user.ConnectUserId,
+ ConnectUserName = user.ConnectUserName
};
var image = user.GetImageInfo(ImageType.Primary, 0);