Merge remote-tracking branch 'jellyfinorigin/master' into feature/10.10/DetachedMigration

2 files changed, 14 insertions, 7 deletions

diff --git a/MediaBrowser.Model/Extensions/ContainerHelper.cs b/MediaBrowser.Model/Extensions/ContainerHelper.cs
index c86328ba6..39e5358ba 100644
--- a/MediaBrowser.Model/Extensions/ContainerHelper.cs
+++ b/MediaBrowser.Model/Extensions/ContainerHelper.cs
@@ -14,7 +14,8 @@ public static class ContainerHelper
     /// in <paramref name="profileContainers"/>.
     /// </summary>
     /// <param name="profileContainers">The comma-delimited string being searched.
-    /// If the parameter begins with the <c>-</c> character, the operation is reversed.</param>
+    /// If the parameter begins with the <c>-</c> character, the operation is reversed.
+    /// If the parameter is empty or null, all containers in <paramref name="inputContainer"/> will be accepted.</param>
     /// <param name="inputContainer">The comma-delimited string being matched.</param>
     /// <returns>The result of the operation.</returns>
     public static bool ContainsContainer(string? profileContainers, string? inputContainer)
@@ -34,7 +35,8 @@ public static class ContainerHelper
     /// in <paramref name="profileContainers"/>.
     /// </summary>
     /// <param name="profileContainers">The comma-delimited string being searched.
-    /// If the parameter begins with the <c>-</c> character, the operation is reversed.</param>
+    /// If the parameter begins with the <c>-</c> character, the operation is reversed.
+    /// If the parameter is empty or null, all containers in <paramref name="inputContainer"/> will be accepted.</param>
     /// <param name="inputContainer">The comma-delimited string being matched.</param>
     /// <returns>The result of the operation.</returns>
     public static bool ContainsContainer(string? profileContainers, ReadOnlySpan<char> inputContainer)
@@ -53,7 +55,8 @@ public static class ContainerHelper
     /// Compares two containers, returning <paramref name="isNegativeList"/> if an item in <paramref name="inputContainer"/>
     /// does not exist in <paramref name="profileContainers"/>.
     /// </summary>
-    /// <param name="profileContainers">The comma-delimited string being searched.</param>
+    /// <param name="profileContainers">The comma-delimited string being searched.
+    /// If the parameter is empty or null, all containers in <paramref name="inputContainer"/> will be accepted.</param>
     /// <param name="isNegativeList">The boolean result to return if a match is not found.</param>
     /// <param name="inputContainer">The comma-delimited string being matched.</param>
     /// <returns>The result of the operation.</returns>
@@ -71,7 +74,8 @@ public static class ContainerHelper
     /// Compares two containers, returning <paramref name="isNegativeList"/> if an item in <paramref name="inputContainer"/>
     /// does not exist in <paramref name="profileContainers"/>.
     /// </summary>
-    /// <param name="profileContainers">The comma-delimited string being searched.</param>
+    /// <param name="profileContainers">The comma-delimited string being searched.
+    /// If the parameter is empty or null, all containers in <paramref name="inputContainer"/> will be accepted.</param>
     /// <param name="isNegativeList">The boolean result to return if a match is not found.</param>
     /// <param name="inputContainer">The comma-delimited string being matched.</param>
     /// <returns>The result of the operation.</returns>
@@ -106,7 +110,8 @@ public static class ContainerHelper
     /// Compares two containers, returning <paramref name="isNegativeList"/> if an item in <paramref name="inputContainer"/>
     /// does not exist in <paramref name="profileContainers"/>.
     /// </summary>
-    /// <param name="profileContainers">The profile containers being matched searched.</param>
+    /// <param name="profileContainers">The profile containers being matched searched.
+    /// If the parameter is empty or null, all containers in <paramref name="inputContainer"/> will be accepted.</param>
     /// <param name="isNegativeList">The boolean result to return if a match is not found.</param>
     /// <param name="inputContainer">The comma-delimited string being matched.</param>
     /// <returns>The result of the operation.</returns>
diff --git a/MediaBrowser.Model/Extensions/LibraryOptionsExtension.cs b/MediaBrowser.Model/Extensions/LibraryOptionsExtension.cs
index 4a814f22a..b088cfb53 100644
--- a/MediaBrowser.Model/Extensions/LibraryOptionsExtension.cs
+++ b/MediaBrowser.Model/Extensions/LibraryOptionsExtension.cs
@@ -18,7 +18,7 @@ public static class LibraryOptionsExtension
     {
         ArgumentNullException.ThrowIfNull(options);
 
-        return options.CustomTagDelimiters.Select<string, char?>(x =>
+        var delimiterList = options.CustomTagDelimiters.Select<string, char?>(x =>
         {
             var isChar = char.TryParse(x, out var c);
             if (isChar)
@@ -27,6 +27,8 @@ public static class LibraryOptionsExtension
             }
 
             return null;
-        }).Where(x => x is not null).Select(x => x!.Value).ToArray();
+        }).Where(x => x is not null).Select(x => x!.Value).ToList();
+        delimiterList.Add('\0');
+        return delimiterList.ToArray();
     }
 }