lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed the image profiler manager returning profile paths even when the image creation has failed (#7901)

Browse Source
This commit is contained in:
Carl Woodhouse 2017-12-07 20:07:49 +00:00 committed by Sébastien Ros
parent 60077743eb
commit 9ea077830b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProfileManager.cs
View File

@ -131,13 +131,12 @@ namespace Orchard.MediaProcessing.Services {
// to handle cross machines concurrency // to handle cross machines concurrency
lock (String.Intern(path)) { lock (String.Intern(path)) {
using (var image = GetImage(path)) { using (var image = GetImage(path)) {
if (image == null) {
return null;
}
var filterContext = new FilterContext { Media = image, FilePath = _storageProvider.Combine("_Profiles", FormatProfilePath(profileName, System.Web.HttpUtility.UrlDecode(path))) }; var filterContext = new FilterContext { Media = image, FilePath = _storageProvider.Combine("_Profiles", FormatProfilePath(profileName, System.Web.HttpUtility.UrlDecode(path))) };
if (image == null) {
return filterContext.FilePath;
}
var tokens = new Dictionary<string, object>(); var tokens = new Dictionary<string, object>();
// if a content item is provided, use it while tokenizing // if a content item is provided, use it while tokenizing
if (contentItem != null) { if (contentItem != null) {