From 56ebb39a70d54d30e2bcf7174b478972318194d6 Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Sun, 8 May 2016 11:27:17 -0500 Subject: [PATCH] Issue #2630578 by mikeryan, jonhattan, Matt B: Formats duplicated in D6 upgrade --- .../filter/migration_templates/d6_filter_format.yml | 10 ++-------- .../src/Tests/d6/MigrateUpgrade6Test.php | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/core/modules/filter/migration_templates/d6_filter_format.yml b/core/modules/filter/migration_templates/d6_filter_format.yml index ffcbbb51b90..6b767f208b1 100644 --- a/core/modules/filter/migration_templates/d6_filter_format.yml +++ b/core/modules/filter/migration_templates/d6_filter_format.yml @@ -6,14 +6,8 @@ source: plugin: d6_filter_format process: format: - - - plugin: machine_name - source: name - - - plugin: dedupe_entity - entity_type: filter_format - field: format - length: 32 + plugin: machine_name + source: name name: name cache: cache filters: diff --git a/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php b/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php index fd22c6ee4fb..d073c186de2 100644 --- a/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php +++ b/core/modules/migrate_drupal_ui/src/Tests/d6/MigrateUpgrade6Test.php @@ -43,7 +43,7 @@ class MigrateUpgrade6Test extends MigrateUpgradeTestBase { 'field_config' => 62, 'field_storage_config' => 43, 'file' => 7, - 'filter_format' => 8, + 'filter_format' => 7, 'image_style' => 5, 'migration' => 105, 'node' => 9,