diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php index ca86ebe35a..862eb704e5 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php @@ -104,9 +104,9 @@ public static function create(ContainerInterface $container, array $configuratio public function checkRequirements() { if ($this->pluginDefinition['requirements_met'] === TRUE) { - // For entity and i18n translations migrate_drupal_multilingual must be - // enabled. - if ((in_array('Multilingual', $this->migration->getMigrationTags()) + // Entity and i18n translations require migrate_drupal_multilingual. + $tags = $this->migration->getMigrationTags() ? $this->migration->getMigrationTags() : []; + if ((in_array('Multilingual', $tags) || (strpos($this->getSourceModule(), 'i18n') !== FALSE))) { if (!\Drupal::service('module_handler') ->moduleExists('migrate_drupal_multilingual')) { diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7ReviewPageTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7ReviewPageTest.php index 28ceaf0987..586bdad1dd 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7ReviewPageTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7ReviewPageTest.php @@ -57,7 +57,6 @@ protected function getAvailablePaths() { 'date', 'dblog', 'email', - 'entity_translation', 'field', 'field_sql_storage', 'file', @@ -134,6 +133,7 @@ protected function getAvailablePaths() { */ protected function getMissingPaths() { return [ + 'entity_translation', 'rdf', 'views', ]; diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php index 762dc191a2..cb9d9e286e 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php @@ -127,7 +127,6 @@ protected function getAvailablePaths() { 'dblog', 'email', 'entityreference', - 'entity_translation', 'field', 'field_sql_storage', 'file', @@ -173,6 +172,7 @@ protected function getAvailablePaths() { */ protected function getMissingPaths() { return [ + 'entity_translation', 'rdf', // These modules are in the missing path list because they are installed // on the source site but they are not installed on the destination site.