#Blocks-Layouts

To answer my own question it is about the return of hook theme.

I prefer TemplateDefinition over TemplateImplementation

This patch is causing problems when reverting revisions.

This is because of the getActive call that was added to retrieve the latest version of the block when editing in stead of the saved revision. I believe it was added to prevent EntityChangedConstraint errors, but they were fixed in https://www.drupal.org/project/drupal/issues/3053881 → .

Steps to reproduce this:

1. Create a page with a text block with title AAAA.
2. Update the page and change the text block title to BBBB.
3. Revert back to the first version.
4. The block title is now AAAA. But when you open the edit form of the block, it shows BBBB (the latest revision)

Code that is causing this behavior (in InlineBlock::blockForm()):

    if (!$this->isNew && !$block->isNew() && empty($this->configuration['block_serialized'])) {
      // Get the active block for editing purposes.
      $block = $this->entityRepository->getActive('block_content', $block->id());
    }

I think there might also be other places that this getActive function is called to prevent the error where it is no longer needed.

I would be willing to update the patch, but have not been active in creating it, so I'm not sure about what I might be breaking when removing this code.

@dburiak mind rebasing

I've created an issue fork from 11.x and ported the changes from patch #20. Still needs updated tests.