aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-04-16 01:09:58 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-04-16 01:09:58 -0400
commitd1b3342e75f61b27f0cb9a8457b6e5ba9b86821c (patch)
treea7318f60af4cfe20ceced3484be2dc4881a625e1
parentcff3df38ee353f49b4be3bb998bd65a119ac58bc (diff)
update inherited tags
-rw-r--r--MediaBrowser.Controller/Entities/BaseItem.cs5
-rw-r--r--MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs2
2 files changed, 1 insertions, 6 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();
}
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 4a784e2533..212be28495 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -80,7 +80,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
private IDbCommand _updateInheritedRatingCommand;
private IDbCommand _updateInheritedTagsCommand;
- private const int LatestSchemaVersion = 61;
+ private const int LatestSchemaVersion = 62;
/// <summary>
/// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.