diff -u b/core/lib/Drupal/Core/Entity/EntityType.php b/core/lib/Drupal/Core/Entity/EntityType.php --- b/core/lib/Drupal/Core/Entity/EntityType.php +++ b/core/lib/Drupal/Core/Entity/EntityType.php @@ -700,7 +700,7 @@ * {@inheritdoc} */ public function showRevisionUi() { - return $this->show_revision_ui; + return $this->isRevisionable() && $this->show_revision_ui; } /** diff -u b/core/modules/block_content/block_content.libraries.yml b/core/modules/block_content/block_content.libraries.yml --- b/core/modules/block_content/block_content.libraries.yml +++ b/core/modules/block_content/block_content.libraries.yml @@ -3,4 +3,5 @@ drupal.block_content: version: VERSION + js: {} dependencies: - core/drupal.entity-form only in patch2: unchanged: --- a/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php +++ b/core/modules/menu_link_content/src/Form/MenuLinkContentForm.php @@ -49,7 +49,7 @@ class MenuLinkContentForm extends ContentEntityForm { * The path validator. */ public function __construct(EntityManagerInterface $entity_manager, MenuParentFormSelectorInterface $menu_parent_selector, LanguageManagerInterface $language_manager, PathValidatorInterface $path_validator) { - parent::__construct($entity_manager, $language_manager); + parent::__construct($entity_manager); $this->menuParentSelector = $menu_parent_selector; $this->pathValidator = $path_validator; }