diff --git a/core/modules/field/src/Plugin/migrate/source/d7/FieldBase.php b/core/modules/field/src/Plugin/migrate/source/d7/FieldBase.php index 49ec150..7c5a3fe 100644 --- a/core/modules/field/src/Plugin/migrate/source/d7/FieldBase.php +++ b/core/modules/field/src/Plugin/migrate/source/d7/FieldBase.php @@ -19,7 +19,8 @@ public function query() { ->fields('fci', ['entity_type']) ->condition('fc.active', 1) ->condition('fc.deleted', 0) - ->condition('fc.storage_active', 1); + ->condition('fc.storage_active', 1) + ->condition('fci.deleted', 0); $query->addField('fci', 'data', 'instance_data'); return $query; } diff --git a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php index 458edbc..c53959a 100644 --- a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php +++ b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php @@ -19,8 +19,7 @@ class FieldInstance extends FieldBase { */ public function query() { $query = parent::query(); - $query->fields('fci', ['bundle', 'data']) - ->condition('fci.deleted', 0); + $query->fields('fci', ['bundle', 'data']); $query->addField('fc', 'data', 'field_data'); // Optionally filter by entity type and bundle.