yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes merge issues

Browse Source
This commit is contained in:
Shannon
2014-12-08 17:19:48 +11:00
parent 0a7bbfb1ca
commit d2dbd91b17
4 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
View File

@@ -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))
{