Merge branch 'master' into tonemap

This commit is contained in:
Nyanmisaka
2020-09-04 02:55:57 +08:00
committed by GitHub
930 changed files with 36240 additions and 39064 deletions

View File

@@ -239,7 +239,7 @@ namespace MediaBrowser.Model.Entities
if (!string.IsNullOrEmpty(Title))
{
var result = new StringBuilder(Title);
var result = new StringBuilder(Title);
foreach (var tag in attributes)
{
// Keep Tags that are not already in Title.
@@ -252,7 +252,7 @@ namespace MediaBrowser.Model.Entities
return result.ToString();
}
return string.Join(" - ", attributes.ToArray());
return string.Join(" - ", attributes);
}
default: