diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php index c5421ed..afddb22 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php @@ -322,7 +322,7 @@ public function isDefaultRevision($new_value = NULL) { * {@inheritdoc} */ public function isRevisionTranslationAffected() { - $field_name = $this->getEntityType()->getKey('revision_translation_affected'); + $field_name = 'revision_translation_affected'; return $this->hasField($field_name) ? $this->get($field_name)->value : TRUE; } @@ -330,7 +330,7 @@ public function isRevisionTranslationAffected() { * {@inheritdoc} */ public function setRevisionTranslationAffected($affected) { - $field_name = $this->getEntityType()->getKey('revision_translation_affected'); + $field_name = 'revision_translation_affected'; if ($this->hasField($field_name)) { $this->set($field_name, $affected); } diff --git a/core/lib/Drupal/Core/Entity/EntityFieldManager.php b/core/lib/Drupal/Core/Entity/EntityFieldManager.php index 332a709..8582294 100644 --- a/core/lib/Drupal/Core/Entity/EntityFieldManager.php +++ b/core/lib/Drupal/Core/Entity/EntityFieldManager.php @@ -223,8 +223,8 @@ protected function buildBaseFieldDefinitions($entity_type_id) { // Make sure that revisionable entity types are correctly defined. if ($entity_type->isRevisionable() && $entity_type->isTranslatable()) { // The 'revision_translation_affected' field should always be defined. - if (!isset($base_field_definitions[$keys['revision_translation_affected']])) { - $base_field_definitions[$keys['revision_translation_affected']] = BaseFieldDefinition::create('boolean') + if (!isset($base_field_definitions['revision_translation_affected'])) { + $base_field_definitions['revision_translation_affected'] = BaseFieldDefinition::create('boolean') ->setLabel($this->t('Revision translation affected')) ->setDescription($this->t('Indicates if the last edit of a translation belongs to current revision.')) ->setReadOnly(TRUE) diff --git a/core/lib/Drupal/Core/Entity/EntityType.php b/core/lib/Drupal/Core/Entity/EntityType.php index 5f6589a..b39fb3f 100644 --- a/core/lib/Drupal/Core/Entity/EntityType.php +++ b/core/lib/Drupal/Core/Entity/EntityType.php @@ -302,7 +302,6 @@ public function __construct($definition) { 'bundle' => '', 'langcode' => '', 'default_langcode' => 'default_langcode', - 'revision_translation_affected' => 'revision_translation_affected', ]; $this->handlers += [ 'access' => 'Drupal\Core\Entity\EntityAccessControlHandler', diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchemaConverter.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchemaConverter.php index ea0f57c..92586b9 100644 --- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchemaConverter.php +++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchemaConverter.php @@ -375,7 +375,7 @@ protected function updateFieldStorageDefinitionsToRevisionable(ContentEntityType // Add the 'revision_translation_affected' field if needed. if ($entity_type->isTranslatable()) { $revision_translation_affected_field = BaseFieldDefinition::create('boolean') - ->setName($entity_type->getKey('revision_translation_affected')) + ->setName('revision_translation_affected') ->setTargetEntityTypeId($entity_type->id()) ->setTargetBundle(NULL) ->setLabel(new TranslatableMarkup('Revision translation affected')) @@ -386,7 +386,7 @@ protected function updateFieldStorageDefinitionsToRevisionable(ContentEntityType if ($update_cached_definitions) { $this->entityDefinitionUpdateManager->installFieldStorageDefinition($revision_translation_affected_field->getName(), $entity_type->id(), $entity_type->getProvider(), $revision_translation_affected_field); - $updated_storage_definitions[$entity_type->getKey('revision_translation_affected')] = $revision_translation_affected_field; + $updated_storage_definitions['revision_translation_affected'] = $revision_translation_affected_field; } } diff --git a/core/modules/system/system.install b/core/modules/system/system.install index c387be0..96ede5d 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -2002,9 +2002,8 @@ function system_update_8402() { }); foreach ($definitions as $entity_type_id => $entity_type) { - $field_name = $entity_type->getKey('revision_translation_affected'); // Install the 'revision_translation_affected' field if needed. - if (!$definition_update_manager->getFieldStorageDefinition($field_name, $entity_type_id)) { + if (!$definition_update_manager->getFieldStorageDefinition('revision_translation_affected', $entity_type_id)) { $storage_definition = BaseFieldDefinition::create('boolean') ->setLabel(t('Revision translation affected')) ->setDescription(t('Indicates if the last edit of a translation belongs to current revision.')) @@ -2013,7 +2012,7 @@ function system_update_8402() { ->setTranslatable(TRUE); $definition_update_manager - ->installFieldStorageDefinition($field_name, $entity_type_id, $entity_type_id, $storage_definition); + ->installFieldStorageDefinition('revision_translation_affected', $entity_type_id, $entity_type_id, $storage_definition); } } }