1 files changed, 26 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Entities/Year.cs b/MediaBrowser.Controller/Entities/Year.cs
index 8deb930e8..59a4bf16d 100644
--- a/MediaBrowser.Controller/Entities/Year.cs
+++ b/MediaBrowser.Controller/Entities/Year.cs
@@ -1,6 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Runtime.Serialization;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -13,7 +15,7 @@ namespace MediaBrowser.Controller.Entities
         /// Gets the user data key.
         /// </summary>
         /// <returns>System.String.</returns>
-        public override string GetUserDataKey()
+        protected override string CreateUserDataKey()
         {
             return "Year-" + Name;
         }
@@ -23,6 +25,7 @@ namespace MediaBrowser.Controller.Entities
         /// If the item is a folder, it returns the folder itself
         /// </summary>
         /// <value>The containing folder path.</value>
+        [IgnoreDataMember]
         public override string ContainingFolderPath
         {
             get
@@ -35,6 +38,7 @@ namespace MediaBrowser.Controller.Entities
         /// Gets a value indicating whether this instance is owned item.
         /// </summary>
         /// <value><c>true</c> if this instance is owned item; otherwise, <c>false</c>.</value>
+        [IgnoreDataMember]
         public override bool IsOwnedItem
         {
             get
@@ -47,8 +51,8 @@ namespace MediaBrowser.Controller.Entities
         {
             int year;
 
-            var usCulture = new CultureInfo("en-US"); 
-            
+            var usCulture = new CultureInfo("en-US");
+
             if (!int.TryParse(Name, NumberStyles.Integer, usCulture, out year))
             {
                 return inputItems;
@@ -56,5 +60,23 @@ namespace MediaBrowser.Controller.Entities
 
             return inputItems.Where(i => i.ProductionYear.HasValue && i.ProductionYear.Value == year);
         }
+
+        public int? GetYearValue()
+        {
+            int i;
+
+            if (int.TryParse(Name, NumberStyles.Integer, CultureInfo.InvariantCulture, out i))
+            {
+                return i;
+            }
+
+            return null;
+        }
+
+        public Func<BaseItem, bool> GetItemFilter()
+        {
+            var val = GetYearValue();
+            return i => i.ProductionYear.HasValue && val.HasValue && i.ProductionYear.Value == val.Value;
+        }
     }
 }