Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

perploug · perploug · commit 2ffc64b96572 · 2013-11-21T00:15:31.000+01:00
diff --git a/src/Umbraco.Web/umbraco.presentation/library.cs b/src/Umbraco.Web/umbraco.presentation/library.cs
@@ -251,13 +251,13 @@ public static XPathNodeIterator JsonToXml(string json)
                     json = "{\"arrayitem\":" + json + "}";
                 }
                 var xml = JsonConvert.DeserializeXmlNode(json, "json", false);
-                return xml.CreateNavigator().Select("/");
+                return xml.CreateNavigator().Select("/json");
             }
             catch (Exception ex)
             {
                 var xd = new XmlDocument();
-                xd.LoadXml(string.Format("<error>Could not convert json to xml. Error: {0}</error>", ex));
-                return xd.CreateNavigator().Select("/");
+                xd.LoadXml(string.Format("<error>Could not convert JSON to XML. Error: {0}</error>", ex));
+                return xd.CreateNavigator().Select("/error");
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -251,13 +251,13 @@ public static XPathNodeIterator JsonToXml(string json)`
`251`	`251`	`json = "{\"arrayitem\":" + json + "}";`
`252`	`252`	`}`
`253`	`253`	`var xml = JsonConvert.DeserializeXmlNode(json, "json", false);`
`254`		`- return xml.CreateNavigator().Select("/");`
	`254`	`+ return xml.CreateNavigator().Select("/json");`
`255`	`255`	`}`
`256`	`256`	`catch (Exception ex)`
`257`	`257`	`{`
`258`	`258`	`var xd = new XmlDocument();`
`259`		`- xd.LoadXml(string.Format("<error>Could not convert json to xml. Error: {0}</error>", ex));`
`260`		`- return xd.CreateNavigator().Select("/");`
	`259`	`+ xd.LoadXml(string.Format("<error>Could not convert JSON to XML. Error: {0}</error>", ex));`
	`260`	`+ return xd.CreateNavigator().Select("/error");`
`261`	`261`	`}`
`262`	`262`	`}`
`263`	`263`