diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php index 2d60c46..98d472d 100644 --- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php @@ -744,7 +744,7 @@ public function buildOverviewForm(array $form, FormStateInterface $form_state) { $form['upgrade_option_item'] = [ '#type' => 'item', '#prefix' => $this->t('An upgrade has already been performed on this site. To perform a new migration, create a clean and empty new install of Drupal 8. Rollbacks and incremental migrations are not yet supported through the user interface. For more information, see the upgrading handbook.', [':url' => 'https://www.drupal.org/upgrade/migrate']), - '#description' => $this->t('
Last upgrade: @date
', ['@date' => $this->dateFormatter->format($date_performed)]), + '#description' => $this->t('Last upgrade: @date', ['@date' => $this->dateFormatter->format($date_performed)]), ]; return $form; } @@ -961,16 +961,10 @@ public function validateCredentialForm(array &$form, FormStateInterface $form_st } catch (\Exception $e) { $error_message = [ - '#type' => 'inline_template', - '#template' => '{% trans %}Resolve the issue below to continue the upgrade.{% endtrans%}{{ errors }}', - '#context' => [ - 'errors' => [ - '#theme' => 'item_list', - '#items' => [$e->getMessage()], - ], - ], + '#title' => $this->t('Resolve the issue below to continue the upgrade.'), + '#theme' => 'item_list', + '#items' => [$e->getMessage()], ]; - $form_state->setErrorByName($database['driver'] . '][0', $this->renderer->renderPlain($error_message)); } } @@ -1083,8 +1077,12 @@ public function buildConfirmForm(array $form, FormStateInterface $form_state) { ]; } $form['counts'] = [ - '#type' => 'item', - '#title' => 'Upgrade analysis report
'); + // The description is added by the buildConfirmForm() method. + // @see \Drupal\migrate_drupal_ui\Form\MigrateUpgradeForm::buildConfirmForm() + return; } /**