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

Conflicts:
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Api.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.ApiInteraction.Javascript.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.Sqlite.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.WorldWeatherOnline.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.WebDashboard.dll

1 files changed, 7 insertions, 4 deletions

diff --git a/MediaBrowser.Controller/Resolvers/CoreResolutionIgnoreRule.cs b/MediaBrowser.Controller/Resolvers/CoreResolutionIgnoreRule.cs
index 2d69f8def..770b673a5 100644
--- a/MediaBrowser.Controller/Resolvers/CoreResolutionIgnoreRule.cs
+++ b/MediaBrowser.Controller/Resolvers/CoreResolutionIgnoreRule.cs
@@ -1,7 +1,6 @@
 using MediaBrowser.Controller.Library;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.Composition;
 using System.Linq;
 
 namespace MediaBrowser.Controller.Resolvers
@@ -9,8 +8,7 @@ namespace MediaBrowser.Controller.Resolvers
     /// <summary>
     /// Provides the core resolver ignore rules
     /// </summary>
-    [Export(typeof(BaseResolutionIgnoreRule))]
-    public class CoreResolutionIgnoreRule : BaseResolutionIgnoreRule
+    public class CoreResolutionIgnoreRule : IResolutionIgnoreRule
     {
         /// <summary>
         /// Any folder named in this list will be ignored - can be added to at runtime for extensibility
@@ -27,7 +25,12 @@ namespace MediaBrowser.Controller.Resolvers
             "extrafanart"
         };
 
-        public override bool ShouldIgnore(ItemResolveArgs args)
+        /// <summary>
+        /// Shoulds the ignore.
+        /// </summary>
+        /// <param name="args">The args.</param>
+        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
+        public bool ShouldIgnore(ItemResolveArgs args)
         {
             // Ignore hidden files and folders
             if (args.IsHidden)