From 5e4a23ea8434cdecb253447142993338945073c0 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Mon, 11 Feb 2013 05:53:44 +0600
Subject: [PATCH] Replaces all calls of Document.Publish to the lesser
 obsoleted method Document.SaveAndPublish which is what Publish was calling
 anyways.

---
 .../umbraco/LiveEditing/Modules/ItemEditing/ItemUpdate.cs     | 3 ++-
 .../umbraco.presentation/umbraco/actions/publish.aspx.cs      | 2 +-
 .../umbraco/channels/UmbracoMetaWeblogAPI.cs                  | 4 ++--
 .../umbraco/webservices/nodeSorter.asmx.cs                    | 3 ++-
 .../businesslogic/skinning/tasks/ModifyPageProperty.cs        | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemUpdate.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemUpdate.cs
index 1ad595176c..9e1ea7d544 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemUpdate.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/ItemUpdate.cs
@@ -1,4 +1,5 @@
 using System;
+using Umbraco.Web.Security;
 using umbraco.cms.businesslogic.property;
 using umbraco.cms.businesslogic.propertytype;
 using umbraco.cms.businesslogic.web;
@@ -96,7 +97,7 @@ namespace umbraco.presentation.LiveEditing.Modules.ItemEditing
             if(!publishedDocuments.Contains(NodeId.Value))
             {
                 Document document = new Document(NodeId.Value);
-                document.Publish(UmbracoEnsuredPage.CurrentUser);
+                document.SaveAndPublish(WebSecurity.CurrentUser);
                 
                 publishedDocuments.Add(NodeId.Value);
             }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs
index 6c2485db21..303ccfbb03 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/publish.aspx.cs
@@ -38,7 +38,7 @@ namespace umbraco.presentation.actions
             deleteMessage.Text = ui.Text("editContentPublishedHeader");
 
             confirm.Visible = false;
-            d.Publish(getUser());
+            d.SaveAndPublish(UmbracoUser);
             
             deleted.Text = ui.Text("editContentPublishedHeader") + " ('" + d.Text + "') " + ui.Text("editContentPublishedText") + "</p><p><a href=\"" + library.NiceUrl(d.Id) + "\"> " + ui.Text("view") + " " + d.Text + "</a>";
         }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
index 987c5965f6..d870b59bec 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
@@ -83,7 +83,7 @@ namespace umbraco.presentation.channels
 
                 if (publish)
                 {
-                    doc.Publish(new User(username));
+                    doc.SaveAndPublish(new User(username));
                 }
                 return true;
             }
@@ -401,7 +401,7 @@ namespace umbraco.presentation.channels
 
                 if (publish)
                 {
-                    doc.Publish(new User(username));
+                    doc.SaveAndPublish(new User(username));
                 }
                 return doc.Id.ToString();
             }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
index eda8ee7bee..e767cf5fd9 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
@@ -7,6 +7,7 @@ using System.Xml;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence.Caching;
 using Umbraco.Web;
+using Umbraco.Web.Security;
 using umbraco.BasePages;
 using umbraco.BusinessLogic.Actions;
 using umbraco.cms.businesslogic.web;
@@ -98,7 +99,7 @@ namespace umbraco.presentation.webservices
                                     // refresh the xml for the sorting to work
                                     if (published)
                                     {
-                                        document.Publish(BusinessLogic.User.GetCurrent());
+                                        document.SaveAndPublish(WebSecurity.CurrentUser);
                                         document.refreshXmlSortOrder();
                                     }
                                 }
diff --git a/src/umbraco.cms/businesslogic/skinning/tasks/ModifyPageProperty.cs b/src/umbraco.cms/businesslogic/skinning/tasks/ModifyPageProperty.cs
index 933715c4ad..cba9da77fb 100644
--- a/src/umbraco.cms/businesslogic/skinning/tasks/ModifyPageProperty.cs
+++ b/src/umbraco.cms/businesslogic/skinning/tasks/ModifyPageProperty.cs
@@ -34,7 +34,7 @@ namespace umbraco.cms.businesslogic.skinning.tasks
                     d.OriginalValue = doc.getProperty(PropertyAlias).Value.ToString();
 
                     doc.getProperty(PropertyAlias).Value = Value;
-                    doc.Publish(new BusinessLogic.User(0));
+                    doc.SaveAndPublish(new BusinessLogic.User(0));
 
                     d.NewValue = Value;
                     d.TaskExecutionStatus = TaskExecutionStatus.Completed;