Issue #3471460 by ahmad khader: Fix users having access to the layout builder on entities regardless of whether the layout is enabled

Issue #3471460 by ahmad khader: Fix users having access to the layout builder on entities regardless of whether the layout is enabled

Closes #3471460

src/Plugin/SectionStorage/OverridesSectionStorage.php

@@ -48,6 +48,12 @@ class OverridesSectionStorage extends OverridesSectionStorageBase {
 
     $result = $any_access->orIf($own_content_access);
 
+    // Access also depends on the default being enabled.
+    $result = $result->andIf($this->getDefaultSectionStorage()->access($operation, $account, TRUE));
+
+    // Access also depends on the default layout being overridable.
+    $result = $result->andIf(AccessResult::allowedIf($this->getDefaultSectionStorage()->isOverridable())->addCacheableDependency($this->getDefaultSectionStorage()));
+
     return $return_as_object ? $result : $result->isAllowed();
   }