Merge branch 'beta'

1 files changed, 11 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Entities/IHasTrailers.cs b/MediaBrowser.Controller/Entities/IHasTrailers.cs
index bc1c7d875..e5cbdff72 100644
--- a/MediaBrowser.Controller/Entities/IHasTrailers.cs
+++ b/MediaBrowser.Controller/Entities/IHasTrailers.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -18,11 +19,20 @@ namespace MediaBrowser.Controller.Entities
         /// <value>The local trailer ids.</value>
         List<Guid> LocalTrailerIds { get; set; }
         List<Guid> RemoteTrailerIds { get; set; }
+    }
 
+    public static class HasTrailerExtensions
+    {
         /// <summary>
         /// Gets the trailer ids.
         /// </summary>
         /// <returns>List&lt;Guid&gt;.</returns>
-        List<Guid> GetTrailerIds();
+        public static List<Guid> GetTrailerIds(this IHasTrailers item)
+        {
+            var list = item.LocalTrailerIds.ToList();
+            list.AddRange(item.RemoteTrailerIds);
+            return list;
+        }
+
     }
 }