From a895a2a20a67dd855d7e7020129ebb263b6cfa66 Mon Sep 17 00:00:00 2001 From: Shannon Deminick Date: Thu, 18 Apr 2013 22:01:28 +0600 Subject: [PATCH] Fixes merge issues, ensures that the tree node is reloaded when publishing. --- src/Umbraco.Web/Search/ExamineEvents.cs | 4 ++-- .../umbraco.presentation/umbraco/editContent.aspx.cs | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web/Search/ExamineEvents.cs b/src/Umbraco.Web/Search/ExamineEvents.cs index b439a2f0e8..0a4e64e332 100644 --- a/src/Umbraco.Web/Search/ExamineEvents.cs +++ b/src/Umbraco.Web/Search/ExamineEvents.cs @@ -137,7 +137,7 @@ namespace Umbraco.Web.Search private static void MemberAfterSave(Member sender, SaveEventArgs e) { //ensure that only the providers are flagged to listen execute - var xml = sender.ToXml(new System.Xml.XmlDocument(), false).ToXElement(); + var xml = ExamineXmlExtensions.ToXElement(sender.ToXml(new System.Xml.XmlDocument(), false)); var providers = ExamineManager.Instance.IndexProviderCollection.OfType() .Where(x => x.EnableDefaultEventHandler); ExamineManager.Instance.ReIndexNode(xml, IndexTypes.Member, providers); @@ -274,7 +274,7 @@ namespace Umbraco.Web.Search xNode.Attributes.Append(d); } - return new XDocument(xNode.ToXElement()); + return new XDocument(ExamineXmlExtensions.ToXElement(xNode)); } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs index fb26da5c8f..5cbd2b87ef 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs @@ -345,6 +345,8 @@ namespace umbraco.cms.presentation { ClientTools.ShowSpeechBubble(speechBubbleIcon.warning, ui.Text("publish"), ui.Text("speechBubbles", "contentPublishedFailedByEvent")); } + + ClientTools.SyncTree(_document.Path, true); } protected void UnPublishDo(object sender, EventArgs e)