diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php index 8be4041675..07409c258a 100644 --- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php @@ -534,17 +534,17 @@ public function buildIdConflictForm(array &$form, FormStateInterface $form_state * The form structure. */ protected function conflictsForm(array &$form, FormStateInterface $form_state, array $conflicts) { - $form['warning'] = [ - '#type' => 'markup', - '#markup' => '

' . $this->t('It looks like you have content on your site which may be overwritten if you continue to run the upgrade. The upgrade should be performed on a clean Drupal 8 installation. For more information, refer to the upgrade handbook.', [':id-conflicts-handbook' => 'https://www.drupal.org/docs/8/upgrade/known-issues-when-upgrading-from-drupal-6-or-7-to-drupal-8#id_conflicts']) . '

', - ]; - $form['conflicts'] = [ '#title' => $this->t('There is conflicting content of these types:'), '#theme' => 'item_list', '#items' => $this->formatConflicts($conflicts), ]; + $form['warning'] = [ + '#type' => 'markup', + '#markup' => '

' . $this->t('It looks like you have content on your new site which may be overwritten if you continue to run this upgrade. The upgrade should be performed on a clean Drupal 8 installation. For more information see the upgrade handbook.', [':id-conflicts-handbook' => 'https://www.drupal.org/docs/8/upgrade/known-issues-when-upgrading-from-drupal-6-or-7-to-drupal-8#id_conflicts']) . '

', + ]; + return $form; } @@ -588,17 +588,17 @@ protected function formatConflicts(array $conflicts) { * The form structure. */ protected function i18nWarningForm(array &$form, FormStateInterface $form_state, array $conflicts) { - $form['i18n_warning'] = [ - '#type' => 'markup', - '#markup' => '

' . $this->t('It looks like you are migrating translated content. Possible ID conflicts for translations are not automatically detected in the current version of Drupal. Refer to the upgrade handbook for instructions on how to avoid ID conflicts with translated content.', [':id-conflicts-handbook' => 'https://www.drupal.org/docs/8/upgrade/known-issues-when-upgrading-from-drupal-6-or-7-to-drupal-8#id_conflicts']) . '

', - ]; - $form['i18n'] = [ '#title' => $this->t('There is translated content of these types:'), '#theme' => 'item_list', '#items' => $this->formatConflicts($conflicts), ]; + $form['i18n_warning'] = [ + '#type' => 'markup', + '#markup' => '

' . $this->t('It looks like you are migrating translated content. Possible ID conflicts for translations are not automatically detected in the current version of Drupal. Refer to the upgrade handbook for instructions on how to avoid ID conflicts with translated content.', [':id-conflicts-handbook' => 'https://www.drupal.org/docs/8/upgrade/known-issues-when-upgrading-from-drupal-6-or-7-to-drupal-8#id_conflicts']) . '

', + ]; + return $form; }