diff --git a/core/includes/entity.api.php b/core/includes/entity.api.php index 8e60f00..9609404 100644 --- a/core/includes/entity.api.php +++ b/core/includes/entity.api.php @@ -11,6 +11,74 @@ */ /** + * Checks entity operation access. + * + * @see \Drupal\Core\Entity\EntityAccessController + * + * @param \Drupal\Core\Entity\EntityInterface $entity + * @param string $operation + * @param \Drupal\Core\Session\AccountInterface $account + * @param string $langcode + * + * @return bool|null + * A boolean to explicitly allow or deny access, or NULL to neither allow nor + * deny access. + */ +function hook_entity_access(\Drupal\Core\Entity\EntityInterface $entity, $operation, \Drupal\Core\Session\AccountInterface $account, $langcode) { + return NULL; +} + +/** + * Checks entity operation access for a specific entity type. + * + * @see \Drupal\Core\Entity\EntityAccessController + * + * @param \Drupal\Core\Entity\EntityInterface $entity + * @param string $operation + * @param \Drupal\Core\Session\AccountInterface $account + * @param string $langcode + * + * @return bool|null + * A boolean to explicitly allow or deny access, or NULL to neither allow nor + * deny access. + */ +function hook_ENTITY_TYPE_access(\Drupal\Core\Entity\EntityInterface $entity, $operation, \Drupal\Core\Session\AccountInterface $account, $langcode) { + return NULL; +} + +/** + * Checks entity create access. + * + * @see \Drupal\Core\Entity\EntityAccessController + * + * @param \Drupal\Core\Session\AccountInterface $account + * @param string $langcode + * + * @return bool|null + * A boolean to explicitly allow or deny access, or NULL to neither allow nor + * deny access. + */ +function hook_entity_create_access(\Drupal\Core\Session\AccountInterface $account, $langcode) { + return NULL; +} + +/** + * Checks entity create access for a specific entity type. + * + * @see \Drupal\Core\Entity\EntityAccessController + * + * @param \Drupal\Core\Session\AccountInterface $account + * @param string $langcode + * + * @return bool|null + * A boolean to explicitly allow or deny access, or NULL to neither allow nor + * deny access. + */ +function hook_ENTITY_TYPE_create_access(\Drupal\Core\Session\AccountInterface $account, $langcode) { + return NULL; +} + +/** * Add to entity type definitions. * * Modules may implement this hook to add information to defined entity types. diff --git a/core/lib/Drupal/Core/Entity/EntityAccessController.php b/core/lib/Drupal/Core/Entity/EntityAccessController.php index 47573c2..5372004 100644 --- a/core/lib/Drupal/Core/Entity/EntityAccessController.php +++ b/core/lib/Drupal/Core/Entity/EntityAccessController.php @@ -58,15 +58,19 @@ public function access(EntityInterface $entity, $operation, $langcode = Language return $access; } - // Invoke hook_entity_access(), hook results take precedence over overridden - // implementations of EntityAccessController::checkAccess(). Entities - // that have checks that need to be done before the hook is invoked should - // do so by overridding this method. + // Invoke hook_entity_access() and hook_ENTITY_TYPE_access(). Hook results + // take precedence over overridden implementations of + // EntityAccessController::checkAccess(). Entities that have checks that + // need to be done before the hook is invoked should do so by overriding + // this method. // We grant access to the entity if both of these conditions are met: // - No modules say to deny access. // - At least one module says to grant access. - $access = $this->moduleHandler->invokeAll($entity->entityType() . '_access', array($entity, $operation, $account, $langcode)); + $access = array_merge( + $this->moduleHandler->invokeAll('entity_access', $entity, $operation, $account, $langcode), + $this->moduleHandler->invokeAll($entity->entityType() . '_access', $entity, $operation, $account, $langcode) + ); if (($return = $this->processAccessHookResults($access)) === NULL) { // No module had an opinion about the access, so let's the access @@ -196,15 +200,19 @@ public function createAccess($entity_bundle = NULL, AccountInterface $account = return $access; } - // Invoke hook_entity_access(), hook results take precedence over overridden - // implementations of EntityAccessController::checkAccess(). Entities - // that have checks that need to be done before the hook is invoked should - // do so by overridding this method. + // Invoke hook_entity_create_access() and hook_ENTITY_TYPE_create_access(). + // Hook results take precedence over overridden implementations of + // EntityAccessController::checkAccess(). Entities that have checks that + // need to be done before the hook is invoked should do so by overriding + // this method. // We grant access to the entity if both of these conditions are met: // - No modules say to deny access. // - At least one module says to grant access. - $access = $this->moduleHandler->invokeAll($this->entity_type . '_create_access', array($account, $context['langcode'])); + $access = array_merge( + $this->moduleHandler->invokeAll('entity_create_access', $account, $context['langcode']), + $this->moduleHandler->invokeAll($this->entityType . '_create_access', $account, $context['langcode']) + ); if (($return = $this->processAccessHookResults($access)) === NULL) { // No module had an opinion about the access, so let's the access