Merge branch 'dev-v7' into temp-U4-7220

2015-12-01 09:57:44 +01:00
parent e11b5c3fdb bfbc6595fb
commit 6040d149ec
3 changed files with 3 additions and 7 deletions
--- a/src/Umbraco.Core/Models/ContentExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentExtensions.cs
@@ -560,8 +560,7 @@ namespace Umbraco.Core.Models
                        //Additional thumbnails configured as prevalues on the DataType
                        if (thumbnailSizes != null)
                        {
-                            var sep = (thumbnailSizes.Contains("") == false && thumbnailSizes.Contains(",")) ? ',' : ';';
-                            foreach (var thumb in thumbnailSizes.Split(sep))
+							foreach (var thumb in thumbnailSizes.Split(new[] { ";", "," }, StringSplitOptions.RemoveEmptyEntries))
                            {
                                int thumbSize;
                                if (thumb != "" && int.TryParse(thumb, out thumbSize))