From e9b137cde80d32dbe29cf87575569edae287be71 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 26 Aug 2014 09:20:32 +1000 Subject: [PATCH] Fixes duplicate key error (U4-5385) --- src/Umbraco.Core/Media/ImageHelper.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/Media/ImageHelper.cs b/src/Umbraco.Core/Media/ImageHelper.cs index f2b848be57..a6cd19ddc0 100644 --- a/src/Umbraco.Core/Media/ImageHelper.cs +++ b/src/Umbraco.Core/Media/ImageHelper.cs @@ -45,8 +45,11 @@ namespace Umbraco.Core.Media var result = new List(); 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()); + + //combine the static dictionary with the additional sizes with only unique values + var allSizes = allSizesDictionary.Select(kv => kv.Key) + .Union(additionalThumbSizes.Where(x => x > 0).Distinct()); + var sizesDictionary = allSizes.ToDictionary(s => s, s => allSizesDictionary.ContainsKey(s) ? allSizesDictionary[s]: ""); foreach (var s in sizesDictionary)