From 97d642a56279e13de1d08943f282a263ffc32b58 Mon Sep 17 00:00:00 2001 From: hartvig Date: Fri, 29 Jan 2010 00:08:26 +0000 Subject: [PATCH] WORK IN PROGRESS, GET THE STABLE SOURCE FROM THE DOWNLOADS TAB Fixes 26071 + 26072 [TFS Changeset #63633] --- umbraco/cms/businesslogic/web/Document.cs | 5 +++++ .../presentation/umbraco/webservices/codeEditorSave.asmx.cs | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/umbraco/cms/businesslogic/web/Document.cs b/umbraco/cms/businesslogic/web/Document.cs index 9381697549..190b63fa6d 100644 --- a/umbraco/cms/businesslogic/web/Document.cs +++ b/umbraco/cms/businesslogic/web/Document.cs @@ -1102,6 +1102,11 @@ namespace umbraco.cms.businesslogic.web x.Attributes.Append(addAttribute(xd, "nodeTypeAlias", ContentType.Alias)); x.Attributes.Append(addAttribute(xd, "path", Path)); + if (!UmbracoSettings.UseLegacyXmlSchema) + { + x.Attributes.Append(addAttribute(xd, "isDoc", "")); + } + if (Deep) { //store children array here because iterating over an Array object is very inneficient. diff --git a/umbraco/presentation/umbraco/webservices/codeEditorSave.asmx.cs b/umbraco/presentation/umbraco/webservices/codeEditorSave.asmx.cs index 1ccaa57c30..fb9549079d 100644 --- a/umbraco/presentation/umbraco/webservices/codeEditorSave.asmx.cs +++ b/umbraco/presentation/umbraco/webservices/codeEditorSave.asmx.cs @@ -96,13 +96,14 @@ namespace umbraco.presentation.webservices try { // Check if there's any documents yet - if (content.Instance.XmlContent.SelectNodes("/root/node").Count > 0) + string xpath = UmbracoSettings.UseLegacyXmlSchema ? "/root/node" : "/root/*"; + if (content.Instance.XmlContent.SelectNodes(xpath).Count > 0) { XmlDocument macroXML = new XmlDocument(); macroXML.LoadXml(""); XslCompiledTransform macroXSLT = new XslCompiledTransform(); - page umbPage = new page(content.Instance.XmlContent.SelectSingleNode("//node [@parentID = -1]")); + page umbPage = new page(content.Instance.XmlContent.SelectSingleNode("//* [@parentID = -1]")); XsltArgumentList xslArgs; xslArgs = macro.AddMacroXsltExtensions();