diff options
| author | Techywarrior <techywarrior@gmail.com> | 2013-04-13 17:04:49 -0700 |
|---|---|---|
| committer | Techywarrior <techywarrior@gmail.com> | 2013-04-13 17:04:49 -0700 |
| commit | 419d85116798bd5e5327c41d711d6cb46d70caeb (patch) | |
| tree | b7b94ae285e70f97c09c3343be4763ac59229957 /MediaBrowser.Controller/Entities | |
| parent | 89ed33bbbcc3f47299a6104cbb1dd20ad3589510 (diff) | |
| parent | 7f1fdbf223f95dfc1435a8ff1b82fd635cc9b1d9 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Controller/Entities')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index ccaabd4382..3c60d3a392 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Common.Extensions; -using MediaBrowser.Controller.Configuration; +using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Localization; @@ -33,7 +32,7 @@ namespace MediaBrowser.Controller.Entities /// Gets or sets the name. /// </summary> /// <value>The name.</value> - public virtual string Name { get; set; } + public string Name { get; set; } /// <summary> /// Gets or sets the id. @@ -478,7 +477,7 @@ namespace MediaBrowser.Controller.Entities /// </summary> /// <value>The end date.</value> public DateTime? EndDate { get; set; } - + /// <summary> /// Gets or sets the display type of the media. /// </summary> @@ -570,7 +569,7 @@ namespace MediaBrowser.Controller.Entities /// </summary> /// <value>The production locations.</value> public List<string> ProductionLocations { get; set; } - + /// <summary> /// Gets or sets the community rating. /// </summary> diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index fed6bb7de3..5816b23f8c 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -127,7 +127,7 @@ namespace MediaBrowser.Controller.Entities /// <returns>IEnumerable{BaseItem}.</returns> protected IEnumerable<BaseItem> GetIndexByPerformer(User user) { - return GetIndexByPerson(user, new List<string> { PersonType.Actor, PersonType.MusicArtist }, LocalizedStrings.Instance.GetString("PerformerDispPref")); + return GetIndexByPerson(user, new List<string> { PersonType.Actor, PersonType.MusicArtist, PersonType.GuestStar }, LocalizedStrings.Instance.GetString("PerformerDispPref")); } /// <summary> |