X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fcore%2Fmodules%2Fmigrate_drupal_ui%2Fsrc%2FForm%2FReviewForm.php;fp=web%2Fcore%2Fmodules%2Fmigrate_drupal_ui%2Fsrc%2FForm%2FReviewForm.php;h=f78109e41f1ff73e056716952eb1f0fdca24ab68;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hp=19dd60b3571beb1cb21ae703a7469e4387dd3387;hpb=74df008bdbb3a11eeea356744f39b802369bda3c;p=yaffs-website

diff --git a/web/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php b/web/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php
index 19dd60b35..f78109e41 100644
--- a/web/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php
+++ b/web/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php
@@ -81,7 +81,6 @@ class ReviewForm extends MigrateUpgradeFormBase {
       'fieldgroup',
       'filefield_meta',
       'help',
-      'i18n',
       'i18nstrings',
       'imageapi',
       'imageapi_gd',
@@ -138,6 +137,7 @@ class ReviewForm extends MigrateUpgradeFormBase {
       'simpletest',
       'stylizer',
       'term_depth',
+      'title',
       'toolbar',
       'translation',
       'trigger',
@@ -237,7 +237,7 @@ class ReviewForm extends MigrateUpgradeFormBase {
     // Add source_module and destination_module for modules that do not need an
     // upgrade path and are enabled on the source site.
     foreach ($this->noUpgradePaths[$version] as $extension) {
-      if ($system_data['module'][$extension]['status']) {
+      if (isset($system_data['module'][$extension]) && $system_data['module'][$extension]['status']) {
         $table_data[$extension]['core'][$extension] = $extension;
       }
     }
@@ -260,12 +260,8 @@ class ReviewForm extends MigrateUpgradeFormBase {
     $missing_module_list = [
       '#type' => 'details',
       '#open' => TRUE,
-      '#title' => [
-        '#type' => 'html_tag',
-        '#tag' => 'span',
-        '#value' => $this->t('Modules that will not be upgraded'),
-        '#attributes' => ['id' => ['error']],
-      ],
+      '#title' => $this->t('Modules that will not be upgraded'),
+      '#summary_attributes' => ['id' => ['error']],
       '#description' => $this->t('There are no modules installed on your new site to replace these modules. If you proceed with the upgrade now, configuration and/or content needed by these modules will not be available on your new site. For more information, see <a href=":review">Review the pre-upgrade analysis</a> in the <a href=":migrate">Upgrading to Drupal 8</a> handbook.', [':review' => 'https://www.drupal.org/docs/8/upgrade/upgrade-using-web-browser#pre-upgrade-analysis', ':migrate' => 'https://www.drupal.org/docs/8/upgrade']),
       '#weight' => 2,
     ];
@@ -301,12 +297,8 @@ class ReviewForm extends MigrateUpgradeFormBase {
     // Available migrations.
     $available_module_list = [
       '#type' => 'details',
-      '#title' => [
-        '#type' => 'html_tag',
-        '#tag' => 'span',
-        '#value' => $this->t('Modules that will be upgraded'),
-        '#attributes' => ['id' => ['checked']],
-      ],
+      '#title' => $this->t('Modules that will be upgraded'),
+      '#summary_attributes' => ['id' => ['checked']],
       '#weight' => 3,
     ];