Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts: # src/Umbraco.Core/Umbraco.Core.csproj # src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less # src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs # src/Umbraco.Web/Umbraco.Web.csproj
This commit is contained in:
@@ -35,6 +35,9 @@ namespace Umbraco.Web.Scheduling
|
||||
{
|
||||
if (_appContext == null) return true; // repeat...
|
||||
|
||||
if (Suspendable.ScheduledPublishing.CanRun == false)
|
||||
return true; // repeat, later
|
||||
|
||||
switch (_appContext.GetCurrentServerRole())
|
||||
{
|
||||
case ServerRole.Slave:
|
||||
|
||||
Reference in New Issue
Block a user