diff --git a/core/modules/node/src/NodeTypeAccessControlHandler.php b/core/modules/node/src/NodeTypeAccessControlHandler.php index 0c0da19..84f3e0c 100644 --- a/core/modules/node/src/NodeTypeAccessControlHandler.php +++ b/core/modules/node/src/NodeTypeAccessControlHandler.php @@ -25,7 +25,7 @@ class NodeTypeAccessControlHandler extends EntityAccessControlHandler { protected function checkAccess(EntityInterface $entity, $operation, $langcode, AccountInterface $account) { switch ($operation) { case 'view': - return AccessResult::allowed(); + return AccessResult::allowedIfHasPermission($account, 'access content'); break; case 'delete': @@ -43,21 +43,4 @@ protected function checkAccess(EntityInterface $entity, $operation, $langcode, A } } - /** - * {@inheritdoc} - */ - public function access(EntityInterface $entity, $operation, $langcode = LanguageInterface::LANGCODE_DEFAULT, AccountInterface $account = NULL, $return_as_object = FALSE) { - $account = $this->prepareUser($account); - - if ($account->hasPermission('bypass node access')) { - $result = AccessResult::allowed()->cachePerPermissions(); - return $return_as_object ? $result : $result->isAllowed(); - } - if (!$account->hasPermission('access content')) { - $result = AccessResult::forbidden()->cachePerPermissions(); - return $return_as_object ? $result : $result->isAllowed(); - } - $result = parent::access($entity, $operation, $langcode, $account, TRUE)->cachePerPermissions(); - return $return_as_object ? $result : $result->isAllowed(); - } }