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

Conflicts:
	MediaBrowser.Controller/Providers/FanartBaseProvider.cs
	MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs

1 files changed, 11 insertions, 2 deletions

diff --git a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
index f6c6ed303..a5823c60e 100644
--- a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
+++ b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
@@ -1,4 +1,6 @@
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Logging;
 using System;
@@ -19,6 +21,12 @@ namespace MediaBrowser.Controller.Providers
         protected ILogger Logger { get; set; }
         protected ILogManager LogManager { get; set; }
 
+        /// <summary>
+        /// Gets the configuration manager.
+        /// </summary>
+        /// <value>The configuration manager.</value>
+        protected IServerConfigurationManager ConfigurationManager { get; private set; }
+
         // Cache these since they will be used a lot
         /// <summary>
         /// The false task result
@@ -103,10 +111,11 @@ namespace MediaBrowser.Controller.Providers
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseMetadataProvider" /> class.
         /// </summary>
-        protected BaseMetadataProvider(ILogManager logManager)
+        protected BaseMetadataProvider(ILogManager logManager, IServerConfigurationManager configurationManager)
         {
             Logger = logManager.GetLogger(GetType().Name);
             LogManager = logManager;
+            ConfigurationManager = configurationManager;
 
             Initialize();
         }