diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php index 0320bba..39d9719 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php @@ -242,6 +242,8 @@ public function buildForm(array $form, array &$form_state, VocabularyInterface $ ), ); foreach ($current_page as $key => $term) { + $uri = $term->uri(); + $edit_uri = $term->uri('edit-form'); $form['terms'][$key]['#term'] = $term; $indentation = array(); if (isset($term->depth) && $term->depth > 0) { @@ -254,7 +256,7 @@ public function buildForm(array $form, array &$form_state, VocabularyInterface $ '#prefix' => !empty($indentation) ? drupal_render($indentation) : '', '#type' => 'link', '#title' => $term->label(), - '#href' => 'taxonomy/term/' . $term->id(), + '#href' => $uri['path'], ); if ($taxonomy_vocabulary->hierarchy != TAXONOMY_HIERARCHY_MULTIPLE && count($tree) > 1) { $parent_fields = TRUE; @@ -297,7 +299,7 @@ public function buildForm(array $form, array &$form_state, VocabularyInterface $ $operations = array( 'edit' => array( 'title' => t('edit'), - 'href' => 'taxonomy/term/' . $term->id() . '/edit', + 'href' => $edit_uri['path'], 'query' => $destination, ), 'delete' => array( diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc index a4788b6..153bbaf 100644 --- a/core/modules/taxonomy/taxonomy.admin.inc +++ b/core/modules/taxonomy/taxonomy.admin.inc @@ -395,7 +395,6 @@ function taxonomy_overview_terms_submit($form, &$form_state) { $vocabulary->save(); } drupal_set_message(t('The configuration options have been saved.')); ->>>>>>> origin/8.x } /**