diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-07-23 18:29:53 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-07-23 18:29:53 -0400 |
| commit | dc7a59c73a1e163f122780bdd8a5ca6cad96eb06 (patch) | |
| tree | 50fadde432bffa3339d2477b6aa5bed3476d452e /MediaBrowser.Providers | |
| parent | e6b22f35e5c712081ee48e536868b15fc6491c19 (diff) | |
ensure custom css is loaded last
Diffstat (limited to 'MediaBrowser.Providers')
| -rw-r--r-- | MediaBrowser.Providers/Manager/ProviderUtils.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/MediaBrowser.Providers/Manager/ProviderUtils.cs b/MediaBrowser.Providers/Manager/ProviderUtils.cs index 042b7241b7..ff266f4c12 100644 --- a/MediaBrowser.Providers/Manager/ProviderUtils.cs +++ b/MediaBrowser.Providers/Manager/ProviderUtils.cs @@ -164,14 +164,6 @@ namespace MediaBrowser.Providers.Manager } } - if (!lockedFields.Contains(MetadataFields.Keywords)) - { - if (replaceData || target.Keywords.Count == 0) - { - target.Keywords = source.Keywords; - } - } - if (!lockedFields.Contains(MetadataFields.ProductionLocations)) { if (replaceData || target.ProductionLocations.Count == 0) diff --git a/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs b/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs index b40e4a1201..db621e554b 100644 --- a/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs +++ b/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs @@ -307,10 +307,10 @@ namespace MediaBrowser.Providers.Movies } } - if (movieData.keywords != null && movieData.keywords.keywords != null) - { - movie.Keywords = movieData.keywords.keywords.Select(i => i.name).ToList(); - } + //if (movieData.keywords != null && movieData.keywords.keywords != null) + //{ + // movie.Keywords = movieData.keywords.keywords.Select(i => i.name).ToList(); + //} if (movieData.trailers != null && movieData.trailers.youtube != null && movieData.trailers.youtube.Count > 0) |