*** taxonomy.admin.inc	20 Jun 2009 20:32:04 +0200	1.55
--- taxonomy.admin.inc	27 Jun 2009 14:04:11 +0200
***************
*** 732,737 ****
--- 732,742 ----
      '#collapsible' => TRUE,
      '#collapsed' => $vocabulary->hierarchy < 2,
    );
+   $form['advanced']['intro'] = array(
+     '#type' => 'item',
+     '#weight' => 0,
+     '#markup' => t("Terms can have a relationship with other terms. The relationship might be parent-child ('parent'), associative ('related') or equivalent ('synonym'). You need third-party modules to display or search the relationship."),
+   );

    // taxonomy_get_tree and taxonomy_get_parents may contain large numbers of
    // items so we check for taxonomy_override_selector before loading the
***************
*** 747,774 ****
      }
      $exclude[] = $edit['tid'];

!     $form['advanced']['parent'] = _taxonomy_term_select(t('Parents'), $parent, $vocabulary->vid, t('Parent terms') . '.', 1, '<' . t('root') . '>', $exclude);
!     $form['advanced']['relations'] = _taxonomy_term_select(t('Related terms'), array_keys(taxonomy_get_related($edit['tid'])), $vocabulary->vid, NULL, 1, '<' . t('none') . '>', array($edit['tid']));
    }
    $form['advanced']['synonyms'] = array(
      '#type' => 'textarea',
      '#title' => t('Synonyms'),
      '#default_value' => implode("\n", taxonomy_get_synonyms($edit['tid'])),
!     '#description' => t('Synonyms of this term, one synonym per line.'));
    $form['advanced']['weight'] = array(
      '#type' => 'textfield',
      '#title' => t('Weight'),
      '#size' => 6,
      '#default_value' => $edit['weight'],
      '#description' => t('Terms are displayed in ascending order by weight.'),
!     '#required' => TRUE);
    $form['vid'] = array(
      '#type' => 'value',
      '#value' => $vocabulary->vid);
    $form['submit'] = array(
      '#type' => 'submit',
!     '#value' => t('Save'));
!
    if ($edit['tid']) {
      $form['delete'] = array(
        '#type' => 'submit',
--- 752,785 ----
      }
      $exclude[] = $edit['tid'];

!     $form['advanced']['parent'] = _taxonomy_term_select(t('Parents'), $parent, $vocabulary->vid, t("Drupal won't make use of parent terms without a third party module."), 1, '<' . t('root') . '>', $exclude);
!     $form['advanced']['parent']['#weight'] = 1;
!     $form['advanced']['relations'] = _taxonomy_term_select(t('Related terms'), array_keys(taxonomy_get_related($edit['tid'])), $vocabulary->vid, t("Drupal won't make use of hierarchical relationships without a third party module."), 1, '<' . t('none') . '>', array($edit['tid']));
!     $form['advanced']['relations']['#weight'] = 2;
    }
    $form['advanced']['synonyms'] = array(
      '#type' => 'textarea',
      '#title' => t('Synonyms'),
      '#default_value' => implode("\n", taxonomy_get_synonyms($edit['tid'])),
!     '#description' => t("Synonyms of this term, one synonym per line. Drupal won't make use of hierarchical relationships without a third party module."),
!     '#weight' => 3,
!   );
    $form['advanced']['weight'] = array(
      '#type' => 'textfield',
      '#title' => t('Weight'),
      '#size' => 6,
      '#default_value' => $edit['weight'],
      '#description' => t('Terms are displayed in ascending order by weight.'),
!     '#required' => TRUE,
!     '#weight' => 4);
    $form['vid'] = array(
      '#type' => 'value',
      '#value' => $vocabulary->vid);
    $form['submit'] = array(
      '#type' => 'submit',
!     '#value' => t('Save'),
!     '#weight' => 5,
!   );
    if ($edit['tid']) {
      $form['delete'] = array(
        '#type' => 'submit',