Merge remote-tracking branch 'origin/6.1.4' into 7.0.0

Conflicts: src/Umbraco.Core/StringExtensions.cs src/Umbraco.Tests/Models/ContentExtensionsTests.cs src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs src/Umbraco.Tests/Umbraco.Tests.csproj src/Umbraco.Tests/packages.config
2013-08-13 18:22:45 +10:00
parent 4e13b0afe6 bfabfd9fa5
commit d7fd1efd60
34 changed files with 376 additions and 117 deletions
--- a/src/umbraco.editorControls/BaseTreePickerEditor.cs
+++ b/src/umbraco.editorControls/BaseTreePickerEditor.cs
@@ -106,7 +106,7 @@ namespace umbraco.editorControls
        public void Save()
        {
            if (ItemIdValue.Value.Trim() != "")
-                _data.Value = ItemIdValue.Value.Trim();
+                _data.Value = int.Parse(ItemIdValue.Value.Trim());
            else
                _data.Value = null;
        }