aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-04-16 01:11:14 -0400
committerLuke <luke.pulverenti@gmail.com>2016-04-16 01:11:14 -0400
commit8d6fc3a4a23c3ef388856b5685d670af8206de13 (patch)
tree03d564df5aad1e4b996ab91b38ae206f76394b43 /MediaBrowser.Controller/Entities
parent5de094674b052f947c56b79d71d4bbfdce49405f (diff)
parentd1b3342e75f61b27f0cb9a8457b6e5ba9b86821c (diff)
Merge pull request #1650 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/Entities')
-rw-r--r--MediaBrowser.Controller/Entities/BaseItem.cs5
1 files changed, 0 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 6a3f3ba192..04371c13b6 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1358,11 +1358,6 @@ namespace MediaBrowser.Controller.Entities
list.AddRange(parent.Tags);
}
- foreach (var parent in LibraryManager.GetCollectionFolders(this))
- {
- list.AddRange(parent.Tags);
- }
-
return list.Distinct(StringComparer.OrdinalIgnoreCase).ToList();
}