Upgraded drupal core with security updates

[yaffs-website] / web / core / modules / block_content / src / Plugin / Block / BlockContentBlock.php

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 e97e740187e173d711ca776dc386b48eac43862b..ef0bd96ea2652e1b1e249ca906ed5689c6b2800b 100644 (file)
--- 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;