diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDelete.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDelete.php index 8562d0a..78aa9b6 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDelete.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/TermDelete.php @@ -100,8 +100,8 @@ public function buildForm(array $form, array &$form_state, TermInterface $taxono */ public function submitForm(array &$form, array &$form_state) { $this->term->delete(); - // @todo Replace procedural code http://drupal.org/node/1980982 $vocabulary = $this->entityManager->getStorageController('taxonomy_vocabulary')->load(array($this->term->bundle())); + // @todo Replace procedural code http://drupal.org/node/1980982 taxonomy_check_vocabulary_hierarchy(reset($vocabulary), array('tid' => $this->term->id())); drupal_set_message(t('Deleted term %name.', array('%name' => $this->term->label()))); watchdog('taxonomy', 'Deleted term %name.', array('%name' => $this->term->label()), WATCHDOG_NOTICE); diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module index a7fd46f..cf7bb21 100644 --- a/core/modules/taxonomy/taxonomy.module +++ b/core/modules/taxonomy/taxonomy.module @@ -431,7 +431,7 @@ function taxonomy_vocabulary_delete_multiple(array $vids) { * term has multiple parents then the vocabulary will be given a hierarchy of * TAXONOMY_HIERARCHY_MULTIPLE. * - * @param Drupal\taxonomy\VocabularyInterface $vocabulary + * @param \Drupal\taxonomy\VocabularyInterface $vocabulary * A taxonomy vocabulary entity. * @param $changed_term * An array of the term structure that was updated.