diff -u b/core/modules/migrate_drupal/src/Plugin/migrate/builder/CckBuilder.php b/core/modules/migrate_drupal/src/Plugin/migrate/builder/CckBuilder.php --- b/core/modules/migrate_drupal/src/Plugin/migrate/builder/CckBuilder.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/builder/CckBuilder.php @@ -75,12 +75,14 @@ * The cckfield plugin instance. */ protected function getCckPlugin($field_type, $core = 6, MigrationInterface $migration = NULL) { - if ($this->cckPluginManager->hasDefinition($field_type)) { - if (empty($this->cckPluginCache[$field_type])) { - $this->cckPluginCache[$field_type] = $this->cckPluginManager->createInstance($field_type, ['core' => $core], $migration); - } + if (!empty($this->cckPluginCache[$field_type])) { return $this->cckPluginCache[$field_type]; } + + if ($this->cckPluginManager->hasDefinition($field_type)) { + $this->cckPluginCache[$field_type] = $this->cckPluginManager->createInstance($field_type, ['core' => $core], $migration); + } + } }