Merge pull request #2613 from MediaBrowser/dev

Dev

2 files changed, 5 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index ebebe71a3..dd2379940 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -456,6 +456,8 @@ namespace MediaBrowser.Controller.Library
         /// <returns>IEnumerable&lt;Folder&gt;.</returns>
         List<Folder> GetCollectionFolders(BaseItem item);
 
+        List<Folder> GetCollectionFolders(BaseItem item, List<Folder> allUserRootChildren);
+
         LibraryOptions GetLibraryOptions(BaseItem item);
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
index 763d27eba..3aa4d4ee2 100644
--- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs
+++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
@@ -114,7 +114,7 @@ namespace MediaBrowser.Controller.Library
                     return false;
                 }
 
-                var parentDir = System.IO.Path.GetDirectoryName(Path) ?? string.Empty;
+                var parentDir = BaseItem.FileSystem.GetDirectoryName(Path) ?? string.Empty;
 
                 return parentDir.Length > _appPaths.RootFolderPath.Length
                        && parentDir.StartsWith(_appPaths.RootFolderPath, StringComparison.OrdinalIgnoreCase);
@@ -130,7 +130,7 @@ namespace MediaBrowser.Controller.Library
         {
             get
             {
-                return IsDirectory && string.Equals(Path, _appPaths.RootFolderPath, StringComparison.OrdinalIgnoreCase);
+                return IsDirectory && BaseItem.FileSystem.AreEqual(Path, _appPaths.RootFolderPath);
             }
         }
 
@@ -300,7 +300,7 @@ namespace MediaBrowser.Controller.Library
             if (args != null)
             {
                 if (args.Path == null && Path == null) return true;
-                return args.Path != null && args.Path.Equals(Path, StringComparison.OrdinalIgnoreCase);
+                return args.Path != null && BaseItem.FileSystem.AreEqual(args.Path, Path);
             }
             return false;
         }