Merge with default

1 files changed, 8 insertions, 11 deletions

diff --git a/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs b/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs
index 95af9a344..dc363956f 100644
--- a/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.Api.HttpHandlers
         {

             return ApiService.IsApiUrlMatch("pluginconfiguration", request);

         }

-        

+

         private BasePlugin _plugin;

         private BasePlugin Plugin

         {

@@ -39,18 +39,15 @@ namespace MediaBrowser.Api.HttpHandlers
             return Task.FromResult(Plugin.Configuration);

         }

 

-        public override TimeSpan CacheDuration

+        protected override async Task<ResponseInfo> GetResponseInfo()

         {

-            get

-            {

-                return TimeSpan.FromDays(7);

-            }

-        }

+            var info = await base.GetResponseInfo().ConfigureAwait(false);

 

-        protected override Task<DateTime?> GetLastDateModified()

-        {

-            return Task.FromResult<DateTime?>(Plugin.ConfigurationDateLastModified);

-        }

+            info.DateLastModified = Plugin.ConfigurationDateLastModified;

 

+            info.CacheDuration = TimeSpan.FromDays(7);

+

+            return info;

+        }

     }

 }