Merge pull request #2215 from MediaBrowser/dev

pass requested fields to data layer

1 files changed, 5 insertions, 29 deletions

diff --git a/MediaBrowser.Providers/Manager/ProviderUtils.cs b/MediaBrowser.Providers/Manager/ProviderUtils.cs
index 5f23cf69c..d98b2e2b1 100644
--- a/MediaBrowser.Providers/Manager/ProviderUtils.cs
+++ b/MediaBrowser.Providers/Manager/ProviderUtils.cs
@@ -99,6 +99,11 @@ namespace MediaBrowser.Providers.Manager
                 target.CustomRating = source.CustomRating;
             }
 
+            if (replaceData || string.IsNullOrEmpty(target.Tagline))
+            {
+                target.Tagline = source.Tagline;
+            }
+
             if (!lockedFields.Contains(MetadataFields.Overview))
             {
                 if (replaceData || string.IsNullOrEmpty(target.Overview))
@@ -165,20 +170,6 @@ namespace MediaBrowser.Providers.Manager
                 }
             }
 
-            if (!lockedFields.Contains(MetadataFields.ProductionLocations))
-            {
-                var sourceHasProductionLocations = source as IHasProductionLocations;
-                var targetHasProductionLocations = target as IHasProductionLocations;
-
-                if (sourceHasProductionLocations != null && targetHasProductionLocations != null)
-                {
-                    if (replaceData || targetHasProductionLocations.ProductionLocations.Count == 0)
-                    {
-                        targetHasProductionLocations.ProductionLocations = sourceHasProductionLocations.ProductionLocations;
-                    }
-                }
-            }
-
             if (replaceData || !target.VoteCount.HasValue)
             {
                 target.VoteCount = source.VoteCount;
@@ -200,7 +191,6 @@ namespace MediaBrowser.Providers.Manager
             MergeMetascore(source, target, lockedFields, replaceData);
             MergeCriticRating(source, target, lockedFields, replaceData);
             MergeAwards(source, target, lockedFields, replaceData);
-            MergeTaglines(source, target, lockedFields, replaceData);
             MergeTrailers(source, target, lockedFields, replaceData);
             MergeShortOverview(source, target, lockedFields, replaceData);
 
@@ -330,20 +320,6 @@ namespace MediaBrowser.Providers.Manager
             }
         }
 
-        private static void MergeTaglines(BaseItem source, BaseItem target, List<MetadataFields> lockedFields, bool replaceData)
-        {
-            var sourceCast = source as IHasTaglines;
-            var targetCast = target as IHasTaglines;
-
-            if (sourceCast != null && targetCast != null)
-            {
-                if (replaceData || targetCast.Taglines.Count == 0)
-                {
-                    targetCast.Taglines = sourceCast.Taglines;
-                }
-            }
-        }
-
         private static void MergeTrailers(BaseItem source, BaseItem target, List<MetadataFields> lockedFields, bool replaceData)
         {
             var sourceCast = source as IHasTrailers;