diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php index eb09717..9e83814 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php @@ -1171,12 +1171,6 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { } } - // Add the base fields provided by the revisionable log entity trait. - $traits_used = class_uses(get_called_class()); - if ($traits_used && isset($traits_used['Drupal\Core\Entity\RevisionLogEntityTrait'])) { - $fields += static::revisionLogBaseFieldDefinitions($entity_type); - } - return $fields; } diff --git a/core/lib/Drupal/Core/Entity/RevisionableContentEntityBase.php b/core/lib/Drupal/Core/Entity/RevisionableContentEntityBase.php index d1d7483..74085c7 100644 --- a/core/lib/Drupal/Core/Entity/RevisionableContentEntityBase.php +++ b/core/lib/Drupal/Core/Entity/RevisionableContentEntityBase.php @@ -20,4 +20,14 @@ use RevisionLogEntityTrait; + /** + * {@inheritdoc} + */ + public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { + $fields = parent::baseFieldDefinitions($entity_type); + + $fields += static::revisionLogBaseFieldDefinitions($entity_type); + return $fields; + } + }