diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php index 5222678..a557063 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php @@ -131,14 +131,6 @@ public function buildForm(array $form, array &$form_state, VocabularyInterface $ // @todo Remove global variables when http://drupal.org/node/2044435 is in. global $pager_page_array, $pager_total, $pager_total_items; - // Check for confirmation forms. - if (isset($form_state['confirm_reset_alphabetical'])) { - // @todo this needs to be a separate route/controller for a confirm form. - // Will be fixed in http://drupal.org/node/1976296. - $this->moduleHandler->loadInclude('taxonomy', 'admin.inc'); - return taxonomy_vocabulary_confirm_reset_alphabetical($form, $form_state, $taxonomy_vocabulary->id()); - } - $form_state['taxonomy']['vocabulary'] = $taxonomy_vocabulary; $parent_fields = FALSE; @@ -440,20 +432,6 @@ public function validateForm(array &$form, array &$form_state) {} * An associative array containing the current state of the form. */ public function submitForm(array &$form, array &$form_state) { - if ($form_state['triggering_element']['#value'] == $this->translation->translate('Reset to alphabetical')) { - // Execute the reset action. - // @todo this needs to be a separate method. - // Will be fixed in http://drupal.org/node/1976296. - if ($form_state['values']['reset_alphabetical'] === TRUE) { - $this->moduleHandler->loadInclude('taxonomy', 'admin.inc'); - return taxonomy_vocabulary_confirm_reset_alphabetical_submit($form, $form_state); - } - // Rebuild the form to confirm the reset action. - $form_state['rebuild'] = TRUE; - $form_state['confirm_reset_alphabetical'] = TRUE; - return; - } - // Sort term order based on weight. uasort($form_state['values']['terms'], 'drupal_sort_weight');