From cbebe0141fd3d36143fdbd6c930981b3d3f46cc9 Mon Sep 17 00:00:00 2001 From: "NielsHartvig@UMBRACORATI.localdomain" Date: Tue, 15 Jan 2013 13:18:37 -0100 Subject: [PATCH 1/2] Fixed U4-1439 4.11.2 DataEditorSetting not working for UserControl wrapper. --- .../userControlWrapper/usercontrolPrevalueEditor.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs b/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs index 3b2ce64443..34b4c1b568 100644 --- a/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs +++ b/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs @@ -165,6 +165,10 @@ namespace umbraco.editorControls.userControlGrapper private void LoadSetttings(string fileName) { + // due to legacy, some user controls may not have the tilde start + if (fileName.StartsWith("~/")) + fileName = fileName.Substring(2); + if (System.IO.File.Exists(IOHelper.MapPath("~/" + fileName))) { From 3403b168f25ac582afea35d4e2aeebae60a148f5 Mon Sep 17 00:00:00 2001 From: "NielsHartvig@UMBRACORATI.localdomain" Date: Tue, 15 Jan 2013 14:15:50 -0100 Subject: [PATCH 2/2] Fixes: U4-1459 Textstring Datatypes stores values in NText field when used on Membertype --- src/umbraco.cms/businesslogic/member/Member.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/umbraco.cms/businesslogic/member/Member.cs b/src/umbraco.cms/businesslogic/member/Member.cs index 0c6bb0e532..b30a664991 100644 --- a/src/umbraco.cms/businesslogic/member/Member.cs +++ b/src/umbraco.cms/businesslogic/member/Member.cs @@ -588,7 +588,7 @@ namespace umbraco.cms.businesslogic.member if (property.Value != null) { string dbType = property.PropertyType.DataTypeDefinition.DbType; - if (dbType.Equals("dataInt")) + if (dbType.Equals("Int")) { int value = 0; if (int.TryParse(property.Value.ToString(), out value)) @@ -596,11 +596,11 @@ namespace umbraco.cms.businesslogic.member poco.Integer = value; } } - else if (dbType.Equals("dataDate")) + else if (dbType.Equals("Date")) { poco.Date = DateTime.Parse(property.Value.ToString()); } - else if (dbType.Equals("dataNvarchar")) + else if (dbType.Equals("Nvarchar")) { poco.VarChar = property.Value.ToString(); }