From cbab279376ff05b6e037a117ae35e8ace79c465d Mon Sep 17 00:00:00 2001 From: gggeek Date: Fri, 2 Jun 2017 13:39:19 +0100 Subject: [PATCH] Improve getting workflow context data when running nested workflows --- Core/WorkflowServiceInner.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Core/WorkflowServiceInner.php b/Core/WorkflowServiceInner.php index 4a6b60a..87dd346 100644 --- a/Core/WorkflowServiceInner.php +++ b/Core/WorkflowServiceInner.php @@ -109,13 +109,14 @@ public function executeMigration(MigrationDefinition $migrationDefinition, $useT protected function executeMigrationInner(Migration $migration, MigrationDefinition $migrationDefinition, $migrationContext, $stepOffset = 0, $useTransaction = true, $adminLogin = null) { + $previousWorkflowName = $this->currentWorkflowName; $this->currentWorkflowName = $migration->name; try { parent::executeMigrationInner($migration, $migrationDefinition, $migrationContext, $stepOffset, $useTransaction, $adminLogin); - $this->currentWorkflowName = null; + $this->currentWorkflowName = $previousWorkflowName; } catch (\Exception $e) { - $this->currentWorkflowName = null; + $this->currentWorkflowName = $previousWorkflowName; throw $e; } }