The Free Software Media System - Server Backend & API
Backport pull request #15435 from jellyfin/release-10.11.z
theguymadmaxde9e653b7361
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.csindex 060705f746..7117e0a8d7 100644--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs@@ -1704,15 +1704,16 @@ public sealed class BaseItemRepositoryif (!string.IsNullOrEmpty(filter.SearchTerm)){- var searchTerm = filter.SearchTerm.ToLower();- if (SearchWildcardTerms.Any(f => searchTerm.Contains(f)))+ var cleanedSearchTerm = GetCleanValue(filter.SearchTerm);+ var originalSearchTerm = filter.SearchTerm.ToLower();+ if (SearchWildcardTerms.Any(f => cleanedSearchTerm.Contains(f))){- searchTerm = $"%{searchTerm.Trim('%')}%";- baseQuery = baseQuery.Where(e => EF.Functions.Like(e.CleanName!.ToLower(), searchTerm) || (e.OriginalTitle != null && EF.Functions.Like(e.OriginalTitle.ToLower(), searchTerm)));+ cleanedSearchTerm = $"%{cleanedSearchTerm.Trim('%')}%";+ baseQuery = baseQuery.Where(e => EF.Functions.Like(e.CleanName!, cleanedSearchTerm) || (e.OriginalTitle != null && EF.Functions.Like(e.OriginalTitle.ToLower(), originalSearchTerm)));}else{- baseQuery = baseQuery.Where(e => e.CleanName!.ToLower().Contains(searchTerm) || (e.OriginalTitle != null && e.OriginalTitle.ToLower().Contains(searchTerm)));+ baseQuery = baseQuery.Where(e => e.CleanName!.Contains(cleanedSearchTerm) || (e.OriginalTitle != null && e.OriginalTitle.ToLower().Contains(originalSearchTerm)));}}