diff core/modules/content_translation/content_translation.admin.inc @ 5:12f9dff5fda9 tip

Update to Drupal core 8.7.1

--- a/core/modules/content_translation/content_translation.admin.inc	Thu Feb 28 13:11:55 2019 +0000
+++ b/core/modules/content_translation/content_translation.admin.inc	Thu May 09 15:34:47 2019 +0100
@@ -182,8 +182,7 @@
   // Allow to configure only fields supporting multilingual storage. We skip our
   // own fields as they are always translatable. Additionally we skip a set of
   // well-known fields implementing entity system business logic.
-  return
-    $definition->isTranslatable() &&
+  return $definition->isTranslatable() &&
     $definition->getProvider() != 'content_translation' &&
     !in_array($definition->getName(), [$entity_type->getKey('langcode'), $entity_type->getKey('default_langcode'), 'revision_translation_affected']);
 }
@@ -256,6 +255,7 @@
             'class' => ['operations'],
           ],
         ],
+        '#field_name' => $field_name,
         'class' => ['field-settings'],
       ];
 
@@ -400,6 +400,6 @@
   }
 
   // Ensure entity and menu router information are correctly rebuilt.
-  \Drupal::entityManager()->clearCachedDefinitions();
+  \Drupal::entityTypeManager()->clearCachedDefinitions();
   \Drupal::service('router.builder')->setRebuildNeeded();
 }