From bfbc6595fb165063fde40f653fbc27feb112a858 Mon Sep 17 00:00:00 2001 From: Claus Date: Mon, 30 Nov 2015 19:29:23 +0100 Subject: [PATCH] Fixed a few more split separators. --- src/Umbraco.Core/Models/ContentExtensions.cs | 3 +-- src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Core/Models/ContentExtensions.cs b/src/Umbraco.Core/Models/ContentExtensions.cs index 88b6308c29..e91996e32a 100644 --- 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)) diff --git a/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs b/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs index fad101b596..12f151876d 100644 --- a/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs +++ b/src/umbraco.cms/businesslogic/datatype/FileHandlerData.cs @@ -89,9 +89,7 @@ namespace umbraco.cms.businesslogic.datatype // additional thumbnails configured as prevalues on the DataType if (_thumbnailSizes != "") { - char sep = (_thumbnailSizes.Contains("") == false && _thumbnailSizes.Contains(",")) ? ',' : ';'; - - foreach (string thumb in _thumbnailSizes.Split(sep)) + foreach (var thumb in _thumbnailSizes.Split(new[] { ";", "," }, StringSplitOptions.RemoveEmptyEntries)) { int thumbSize; if (thumb != "" && int.TryParse(thumb, out thumbSize))