From d2dbd91b17fbc87c8d0c7a131a2bfecf44377fd6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 8 Dec 2014 17:19:48 +1100
Subject: [PATCH] Fixes merge issues

---
 src/Umbraco.Web/Scheduling/LogScrubber.cs         | 3 +--
 src/Umbraco.Web/Scheduling/ScheduledPublishing.cs | 5 ++---
 src/Umbraco.Web/Scheduling/Scheduler.cs           | 4 ----
 src/Umbraco.Web/Umbraco.Web.csproj                | 1 -
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web/Scheduling/LogScrubber.cs b/src/Umbraco.Web/Scheduling/LogScrubber.cs
index 538ed24c85..1c7a8f3537 100644
--- a/src/Umbraco.Web/Scheduling/LogScrubber.cs
+++ b/src/Umbraco.Web/Scheduling/LogScrubber.cs
@@ -47,8 +47,7 @@ namespace Umbraco.Web.Scheduling
             using (DisposableTimer.DebugDuration<LogScrubber>(() => "Log scrubbing executing", () => "Log scrubbing complete"))
             {
                 Log.CleanLogs(GetLogScrubbingMaximumAge(_settings));
-            }
-            }
+            }           
         }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
index 678bf98577..8a64098764 100644
--- a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
+++ b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
@@ -42,11 +42,10 @@ namespace Umbraco.Web.Scheduling
 
                 _isPublishingRunning = true;
 
-                var umbracoBaseUrl = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl(_appContext);
+                var umbracoBaseUrl = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl(_appContext, _settings);
 
                 try
-                {
-                    var umbracoBaseUrl = ServerEnvironmentHelper.GetCurrentServerUmbracoBaseUrl(_appContext, _settings);
+                {                    
 
                     if (string.IsNullOrWhiteSpace(umbracoBaseUrl))
                     {
diff --git a/src/Umbraco.Web/Scheduling/Scheduler.cs b/src/Umbraco.Web/Scheduling/Scheduler.cs
index 3d5b977b68..cf2b366e40 100644
--- a/src/Umbraco.Web/Scheduling/Scheduler.cs
+++ b/src/Umbraco.Web/Scheduling/Scheduler.cs
@@ -100,10 +100,6 @@ namespace Umbraco.Web.Scheduling
             _scrubberRunner.Add(new LogScrubber(appContext, settings));
         }
 
-        private static void PerformLogScrub(ApplicationContext appContext)
-        {
-            _scrubberRunner.Add(new LogScrubber(appContext));
-        }
         /// <summary>
         /// This performs all of the scheduling on the one timer
         /// </summary>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index e6f450189d..3b043bb52a 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -493,7 +493,6 @@
     <Compile Include="Mvc\UmbracoVirtualNodeRouteHandler.cs" />
     <Compile Include="Routing\CustomRouteUrlProvider.cs" />
     <Compile Include="Routing\UrlProviderExtensions.cs" />
-    <Compile Include="Scheduling\TaskEventArgs.cs" />
     <Compile Include="Strategies\Migrations\ClearCsrfCookiesAfterUpgrade.cs" />
     <Compile Include="Strategies\Migrations\ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs" />
     <Compile Include="Strategies\Migrations\EnsureListViewDataTypeIsCreated.cs" />