X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fblock_content%2Fsrc%2FPlugin%2FBlock%2FBlockContentBlock.php;fp=web%2Fcore%2Fmodules%2Fblock_content%2Fsrc%2FPlugin%2FBlock%2FBlockContentBlock.php;h=ef0bd96ea2652e1b1e249ca906ed5689c6b2800b;hp=e97e740187e173d711ca776dc386b48eac43862b;hb=bfbba508964731508b9bd6d5835c2edc858db95b;hpb=cb9a80db11fc6b014e5b1e693a5a391c95eb5d9a

diff --git a/web/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php b/web/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
index e97e74018..ef0bd96ea 100644
--- a/web/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
+++ b/web/core/modules/block_content/src/Plugin/Block/BlockContentBlock.php
@@ -178,8 +178,8 @@ class BlockContentBlock extends BlockBase implements ContainerFactoryPluginInter
    *   The block content entity.
    */
   protected function getEntity() {
-    $uuid = $this->getDerivativeId();
     if (!isset($this->blockContent)) {
+      $uuid = $this->getDerivativeId();
       $this->blockContent = $this->entityManager->loadEntityByUuid('block_content', $uuid);
     }
     return $this->blockContent;