starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-24 01:34:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
LukePulverenti
2013-02-26 23:19:11 -05:00
parent 3751e14eb1 4b2cf29fe1
commit 511328edf9
8 changed files with 60 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Api/PluginService.cs
View File

@@ -202,9 +202,9 @@ namespace MediaBrowser.Api
var result = new PluginSecurityInfo
{
IsMBSupporter = kernel.PluginSecurityManager.IsMBSupporter,
SupporterKey = kernel.PluginSecurityManager.SupporterKey,
LegacyKey = kernel.PluginSecurityManager.LegacyKey
IsMBSupporter = kernel.SecurityManager.IsMBSupporter,
SupporterKey = kernel.SecurityManager.SupporterKey,
LegacyKey = kernel.SecurityManager.LegacyKey
};
return ToOptimizedResult(result);
@@ -220,8 +220,8 @@ namespace MediaBrowser.Api
var info = _jsonSerializer.DeserializeFromStream<PluginSecurityInfo>(request.RequestStream);
kernel.PluginSecurityManager.SupporterKey = info.SupporterKey;
kernel.PluginSecurityManager.LegacyKey = info.LegacyKey;
kernel.SecurityManager.SupporterKey = info.SupporterKey;
kernel.SecurityManager.LegacyKey = info.LegacyKey;
}
/// <summary>