diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php index 88dc6c108c..383d4c3ab1 100644 --- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php @@ -720,11 +720,16 @@ public function buildConfirmForm(array $form, FormStateInterface $form_state) { } } + // Fetch the system data at the first opportunity. + $system_data = $form_state->get('system_data'); + // Add source_module and destination_module for modules that do not need an - // upgrade path. + // upgrade path and are enabled on the source site.. $no_upgrade_path = $form_state->get('no_upgrade_path'); foreach ($no_upgrade_path[$version] as $module) { - $table_data[$module]['core'][$module] = $module; + if ($system_data['module'][$module]['status']) { + $table_data[$module]['core'][$module] = $module; + } } // Sort the table by source module names and within that destination @@ -734,8 +739,6 @@ public function buildConfirmForm(array $form, FormStateInterface $form_state) { ksort($table_data[$source_module]); } - // Fetch the system data at the first opportunity. - $system_data = $form_state->get('system_data'); // Remove core profiles from the system data. foreach (['standard', 'minimal'] as $profile) { unset($system_data['module'][$profile]);