Fix post-merge

2018-03-30 11:00:07 +02:00
parent f7a3c97da0
commit c75d4e5b5b
5 changed files with 32 additions and 42 deletions
--- a/src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs
+++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs
@@ -18,11 +18,6 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
        public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType, object source, bool preview)
        {
            return source.TryConvertTo<int>().Result;
-
-            // in json an integer comes back as Int64
-            // ignore overflows ;(
-            if (source is long)
-                return Convert.ToInt32(source);
        }
    }
 }