diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php index 6d3b693..8f0b750 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDeleteForm.php @@ -11,6 +11,7 @@ use Drupal\Core\Entity\EntityControllerInterface; use Drupal\Core\Entity\EntityStorageControllerInterface; use Drupal\Core\Entity\EntityNGConfirmFormBase; +use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Cache\Cache; /** @@ -31,7 +32,8 @@ class TermDeleteForm extends EntityNGConfirmFormBase implements EntityController * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage_controller * The Entity manager. */ - public function __construct(EntityStorageControllerInterface $storage_controller) { + public function __construct(ModuleHandlerInterface $module_handler, EntityStorageControllerInterface $storage_controller) { + parent::__construct($module_handler); $this->storageController = $storage_controller; } @@ -40,6 +42,7 @@ public function __construct(EntityStorageControllerInterface $storage_controller */ public static function createInstance(ContainerInterface $container, $entity_type, array $entity_info) { return new static( + $container->get('module_handler'), $container->get('plugin.manager.entity')->getStorageController('taxonomy_vocabulary') ); } diff --git a/core/modules/taxonomy/taxonomy.routing.yml b/core/modules/taxonomy/taxonomy.routing.yml index 728a68e..6dd6ee0 100644 --- a/core/modules/taxonomy/taxonomy.routing.yml +++ b/core/modules/taxonomy/taxonomy.routing.yml @@ -1,16 +1,16 @@ taxonomy_term_delete: pattern: '/taxonomy/term/{taxonomy_term}/delete' defaults: - _entity_form: taxonomy_term.delete + _entity_form: 'taxonomy_term.delete' requirements: - _entity_access: taxonomy_term.delete + _entity_access: 'taxonomy_term.delete' taxonomy_vocabulary_delete: pattern: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/delete' defaults: - _entity_form: taxonomy_vocabulary.delete + _entity_form: 'taxonomy_vocabulary.delete' requirements: - _entity_access: taxonomy_vocabulary.delete + _entity_access: 'taxonomy_vocabulary.delete' taxonomy_vocabulary_list: pattern: '/admin/structure/taxonomy'