U4-4575 - fix 8371105

Stephan · Stephan · commit 9940b78a5726 · 2014-04-02T17:00:24.000+02:00
diff --git a/src/Umbraco.Web/Models/PublishedProperty.cs b/src/Umbraco.Web/Models/PublishedProperty.cs
@@ -55,13 +55,20 @@ internal static IEnumerable<IPublishedProperty> MapProperties(
                     var v = p == null || p.Value == null ? null : p.Value;
                     if (v != null)
                     {
-                        var dataType = dataTypesResolver.DataTypes.SingleOrDefault(qq => qq.Id == x.PropertyEditorGuid);
+                        // note - not sure about the performance here
+                        var dataTypeDefinition = global::umbraco.cms.businesslogic.datatype.DataTypeDefinition
+                            .GetDataTypeDefinition(x.DataTypeId);
+                        var dataType = dataTypeDefinition.DataType;
                         if (dataType != null)
                         {
                             var data = dataType.Data;
                             data.Value = v;
                             var n = data.ToXMl(new XmlDocument());
-                            v = n.InnerXml;
+                            if (n.NodeType == XmlNodeType.CDATA || n.NodeType == XmlNodeType.Text)
+                                v = n.InnerText;
+                            else if (n.NodeType == XmlNodeType.Element)
+                                v = n.InnerXml;
+                            // note - is there anything else we should take care of?
                         }
                     }
                     // fixme - means that the IPropertyValueConverter will always get a string

Original file line number	Diff line number	Diff line change
`@@ -55,13 +55,20 @@ internal static IEnumerable<IPublishedProperty> MapProperties(`
`55`	`55`	`var v = p == null \|\| p.Value == null ? null : p.Value;`
`56`	`56`	`if (v != null)`
`57`	`57`	`{`
`58`		`- var dataType = dataTypesResolver.DataTypes.SingleOrDefault(qq => qq.Id == x.PropertyEditorGuid);`
	`58`	`+ // note - not sure about the performance here`
	`59`	`+ var dataTypeDefinition = global::umbraco.cms.businesslogic.datatype.DataTypeDefinition`
	`60`	`+ .GetDataTypeDefinition(x.DataTypeId);`
	`61`	`+ var dataType = dataTypeDefinition.DataType;`
`59`	`62`	`if (dataType != null)`
`60`	`63`	`{`
`61`	`64`	`var data = dataType.Data;`
`62`	`65`	`data.Value = v;`
`63`	`66`	`var n = data.ToXMl(new XmlDocument());`
`64`		`- v = n.InnerXml;`
	`67`	`+ if (n.NodeType == XmlNodeType.CDATA \|\| n.NodeType == XmlNodeType.Text)`
	`68`	`+ v = n.InnerText;`
	`69`	`+ else if (n.NodeType == XmlNodeType.Element)`
	`70`	`+ v = n.InnerXml;`
	`71`	`+ // note - is there anything else we should take care of?`
`65`	`72`	`}`
`66`	`73`	`}`
`67`	`74`	`// fixme - means that the IPropertyValueConverter will always get a string`