From 6fae57c5e97ebf4fc4a93d7837ed71c8406d7d1d Mon Sep 17 00:00:00 2001 From: Andrew Swerlick Date: Tue, 8 Apr 2014 01:10:06 -0400 Subject: [PATCH] Fix for U4-4636. Changed to pass in the defined fileAddition names for preset sizes and pass in an empty string for additional file sizes --- src/Umbraco.Core/Media/ImageHelper.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Core/Media/ImageHelper.cs b/src/Umbraco.Core/Media/ImageHelper.cs index 762fe73f22..9cb44afb18 100644 --- a/src/Umbraco.Core/Media/ImageHelper.cs +++ b/src/Umbraco.Core/Media/ImageHelper.cs @@ -44,14 +44,18 @@ namespace Umbraco.Core.Media var result = new List(); - var allSizes = new List {100, 500}; + var allSizesDictionary = new Dictionary {{100,"thumb"}, {500,"big-thumb"}}; + var allSizes = allSizesDictionary.Select(kv => kv.Key).ToList(); allSizes.AddRange(additionalThumbSizes.Where(x => x > 0).Distinct()); + var sizesDictionary = allSizes.ToDictionary(s => s, s => allSizesDictionary.ContainsKey(s) ? allSizesDictionary[s]: ""); - foreach (var s in allSizes) + foreach (var s in sizesDictionary) { - if (originalImage.Width >= s && originalImage.Height >= s) + var size = s.Key; + var name = s.Value; + if (originalImage.Width >= size && originalImage.Height >= size) { - result.Add(Resize(fs, fileName, extension, s, "thumb", originalImage)); + result.Add(Resize(fs, fileName, extension, size, name, originalImage)); } }