X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fmigrate_drupal%2Fsrc%2FPlugin%2Fmigrate%2FFieldMigration.php;h=3ca8f26a8bbe88588bff99a8e00ae69d09cd6c3c;hb=1c1cb0980bfa6caf0c24cce671b6bb541dc87583;hp=c7aaa2df357a23b7259b8d17eb20669eb18754a6;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/web/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php b/web/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php
index c7aaa2df3..3ca8f26a8 100644
--- a/web/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php
+++ b/web/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php
@@ -140,25 +140,25 @@ class FieldMigration extends Migration implements ContainerFactoryPluginInterfac
         $field_type = $row->getSourceProperty('type');
 
         try {
-          $plugin_id = $this->cckPluginManager->getPluginIdFromFieldType($field_type, [], $this);
-          $Manager = $this->cckPluginManager;
+          $plugin_id = $this->fieldPluginManager->getPluginIdFromFieldType($field_type, [], $this);
+          $manager = $this->fieldPluginManager;
         }
         catch (PluginNotFoundException $ex) {
           try {
-            $plugin_id = $this->fieldPluginManager->getPluginIdFromFieldType($field_type, [], $this);
-            $Manager = $this->fieldPluginManager;
+            $plugin_id = $this->cckPluginManager->getPluginIdFromFieldType($field_type, [], $this);
+            $manager = $this->cckPluginManager;
           }
           catch (PluginNotFoundException $ex) {
             continue;
           }
         }
 
-        if (!isset($this->processedFieldTypes[$field_type]) && $Manager->hasDefinition($plugin_id)) {
+        if (!isset($this->processedFieldTypes[$field_type]) && $manager->hasDefinition($plugin_id)) {
           $this->processedFieldTypes[$field_type] = TRUE;
           // Allow the field plugin to alter the migration as necessary so that
           // it knows how to handle fields of this type.
           if (!isset($this->fieldPluginCache[$field_type])) {
-            $this->fieldPluginCache[$field_type] = $Manager->createInstance($plugin_id, [], $this);
+            $this->fieldPluginCache[$field_type] = $manager->createInstance($plugin_id, [], $this);
           }
         }
         $method = $this->pluginDefinition[static::PLUGIN_METHOD];