Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / migrate_drupal / migrate_drupal.module

diff --git a/web/core/modules/migrate_drupal/migrate_drupal.module b/web/core/modules/migrate_drupal/migrate_drupal.module
index 2de259515c43ed997658c04378c3db064d686f7f..b32fb58eba087092e2e83e6d3a17f9711baa2660 100644 (file)
--- a/web/core/modules/migrate_drupal/migrate_drupal.module
+++ b/web/core/modules/migrate_drupal/migrate_drupal.module
@@ -9,7 +9,6 @@ use Drupal\Core\Database\DatabaseExceptionWrapper;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\MigrateExecutable;
-use Drupal\migrate\MigrateMessage;
 use Drupal\migrate\Plugin\RequirementsInterface;
 
 /**
@@ -41,6 +40,9 @@ function migrate_drupal_migration_plugins_alter(&$definitions) {
       'destination' => [
         'plugin' => 'null',
       ],
+      'idMap' => [
+        'plugin' => 'null',
+      ],
     ];
     $vocabulary_migration = \Drupal::service('plugin.manager.migration')->createStubMigration($vocabulary_migration_definition);
 
@@ -49,7 +51,7 @@ function migrate_drupal_migration_plugins_alter(&$definitions) {
       if ($source_plugin instanceof RequirementsInterface) {
         $source_plugin->checkRequirements();
       }
-      $executable = new MigrateExecutable($vocabulary_migration, new MigrateMessage());
+      $executable = new MigrateExecutable($vocabulary_migration);
       $process = ['vid' => $definitions['d6_taxonomy_vocabulary']['process']['vid']];
       foreach ($source_plugin as $row) {
         $executable->processRow($row, $process);