UserPhotoManager: fixed SearchInCache

This commit is contained in:
pavelbannov 2019-12-09 15:49:36 +03:00
parent fdfaae8abe
commit d187c8c82b

View File

@ -33,6 +33,7 @@ using System.Drawing.Imaging;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using ASC.Common.Caching; using ASC.Common.Caching;
using ASC.Common.Logging; using ASC.Common.Logging;
using ASC.Common.Threading.Workers; using ASC.Common.Threading.Workers;
@ -41,6 +42,7 @@ using ASC.Core.Common.Settings;
using ASC.Core.Tenants; using ASC.Core.Tenants;
using ASC.Data.Storage; using ASC.Data.Storage;
using ASC.Web.Core.Utility.Skins; using ASC.Web.Core.Utility.Skins;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
@ -177,9 +179,7 @@ namespace ASC.Web.Core.Users
} }
else else
{ {
fileName = photo? fileName = (photo?.FirstOrDefault(x => x.Key == userId && !string.IsNullOrEmpty(x.Value) && x.Value.Contains("_orig_")))?.Value;
.Select(x => x.Value)
.FirstOrDefault(x => !string.IsNullOrEmpty(x) && x.Contains("_orig_"));
} }
return fileName; return fileName;