yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-01-15 14:19:52 -01:00
parent c103f93004 3403b168f2
commit 468af78d38
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/umbraco.cms/businesslogic/member/Member.cs
View File

@@ -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();
}

4
src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
View File

@@ -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)))
{