Terms not displayed when editing node

DRUPAL-4-7 branch.

This bug was introduced by Patch #33747 by Ber and Moshe: bugfix + code improvement: clean up some of the taxonomy loading code. (original issue).

As of that patch, a node object gets a taxonomy field when loading. Function taxonomy_form_alter thinks it should be in another format, though:

    if (!isset($node->taxonomy)) {
      if ($node->nid) {
        $terms = taxonomy_node_get_terms($node->nid);
      }
      else {
        $terms = array();
      }
    }
    else {
      $terms = $node->taxonomy;
    }

    // Some code omitted
        $ntterms = isset($node->taxonomy) ? $terms : array_keys($terms);

In this case, array_key($terms) would be the way to get the right data. Perhaps we can simply always do that - but I am not sure why this test is here anyway. On the other hand, if we have a taxonomy node field, we should make sure it always has the same format, so that might be the right way to fix it anyway.

Thanks,
  Frodo