diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs
index 3a2412aebf..e9c472e429 100644
--- a/MediaBrowser.Controller/Dto/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs
@@ -279,6 +279,11 @@ namespace MediaBrowser.Controller.Dto
dto.HomePageUrl = item.HomePageUrl;
}
+ if (fields.Contains(ItemFields.Tags))
+ {
+ dto.Tags = item.Tags;
+ }
+
if (fields.Contains(ItemFields.ProductionLocations))
{
dto.ProductionLocations = item.ProductionLocations;
diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
index b2a556e3d2..4d60aa5175 100644
--- a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
@@ -939,20 +939,29 @@ namespace MediaBrowser.Controller.Providers.Movies
if (ourRelease.release_date > new DateTime(1900, 1, 1))
{
- movie.PremiereDate = ourRelease.release_date.ToUniversalTime();
- movie.ProductionYear = ourRelease.release_date.Year;
+ if (ourRelease.release_date.Year != 1)
+ {
+ movie.PremiereDate = ourRelease.release_date.ToUniversalTime();
+ movie.ProductionYear = ourRelease.release_date.Year;
+ }
}
else
{
- movie.PremiereDate = usRelease.release_date.ToUniversalTime();
- movie.ProductionYear = usRelease.release_date.Year;
+ if (usRelease.release_date.Year != 1)
+ {
+ movie.PremiereDate = usRelease.release_date.ToUniversalTime();
+ movie.ProductionYear = usRelease.release_date.Year;
+ }
}
}
else
{
- //no specific country release info at all
- movie.PremiereDate = movieData.release_date.ToUniversalTime();
- movie.ProductionYear = movieData.release_date.Year;
+ if (movieData.release_date.Year != 1)
+ {
+ //no specific country release info at all
+ movie.PremiereDate = movieData.release_date.ToUniversalTime();
+ movie.ProductionYear = movieData.release_date.Year;
+ }
}
//if that didn't find a rating and we are a boxset, use the one from our first child
@@ -966,8 +975,8 @@ namespace MediaBrowser.Controller.Providers.Movies
boxset.OfficialRating = firstChild != null ? firstChild.OfficialRating : null;
}
- //if (movie.RunTimeTicks == null && movieData.runtime > 0)
- // movie.RunTimeTicks = TimeSpan.FromMinutes(movieData.runtime).Ticks;
+ if (movie.RunTimeTicks == null && movieData.runtime > 0)
+ movie.RunTimeTicks = TimeSpan.FromMinutes(movieData.runtime).Ticks;
//studios
if (movieData.production_companies != null)
diff --git a/MediaBrowser.Model/DTO/BaseItemDto.cs b/MediaBrowser.Model/DTO/BaseItemDto.cs
index e8f389940d..076fa7bfcc 100644
--- a/MediaBrowser.Model/DTO/BaseItemDto.cs
+++ b/MediaBrowser.Model/DTO/BaseItemDto.cs
@@ -276,6 +276,12 @@ namespace MediaBrowser.Model.Dto
/// The index options.
public string[] IndexOptions { get; set; }
+ ///
+ /// Gets or sets the tags.
+ ///
+ /// The tags.
+ public List Tags { get; set; }
+
///
/// Gets or sets the primary image aspect ratio.
///
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index 2e6e6b7dcb..875329c70f 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -131,6 +131,11 @@ namespace MediaBrowser.Model.Querying
///
Taglines,
+ ///
+ /// The tags
+ ///
+ Tags,
+
///
/// The trailer url of the item
///