aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Net
diff options
context:
space:
mode:
authorMichalis Adamidis <gsnerf@gsnerf.de>2014-09-14 18:00:44 +0200
committerMichalis Adamidis <gsnerf@gsnerf.de>2014-09-14 18:00:44 +0200
commit411a0531e0a71b2d458b5b3a8a9951ca763ca09a (patch)
tree871614a2cab9da0aa95d1d1f9f350d80fcf56271 /MediaBrowser.Controller/Net
parent4f3ea6c6c3cdde7f4b8d21dc97c711635d73b4e0 (diff)
parent6a177d21478774b3ea1a5adc606935bb3aff65bf (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Controller/Net')
-rw-r--r--MediaBrowser.Controller/Net/LoggedAttribute.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Net/LoggedAttribute.cs b/MediaBrowser.Controller/Net/LoggedAttribute.cs
index 6df72f7a7..ea07b1c7f 100644
--- a/MediaBrowser.Controller/Net/LoggedAttribute.cs
+++ b/MediaBrowser.Controller/Net/LoggedAttribute.cs
@@ -33,7 +33,7 @@ namespace MediaBrowser.Controller.Net
{
var userId = auth.UserId;
- user = UserManager.GetUserById(new Guid(userId));
+ user = UserManager.GetUserById(userId);
}
string deviceId = auth.DeviceId;