Index: nat.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nat/nat.module,v
retrieving revision 1.34.2.4
diff -u -p -r1.34.2.4 nat.module
--- nat.module	14 Feb 2009 18:21:10 -0000	1.34.2.4
+++ nat.module	14 Feb 2009 21:38:07 -0000
@@ -91,6 +91,9 @@ function nat_nodeapi(&$node, $op, $tease
 
       // Save node-term association in the NAT table.
       _nat_save_association($node->nid, $terms);
+
+      // Set $node->nat here to give other modules easy access to NAT terms
+      $node->nat = nat_get_terms($node->nid);
       break;
     case 'update':
       $body = $node->body;
@@ -98,8 +101,8 @@ function nat_nodeapi(&$node, $op, $tease
       $body = isset($nat_config['body'][$node->type]) ? $body : '';
 
       // Update node title in term(s).
-      $terms = nat_get_terms($node->nid);
-      _nat_update_terms($terms, $node->title, $body, $node->taxonomy, $node->nat['related'], $node->nat['synonyms']);
+      $node->nat = nat_get_terms($node->nid);
+      _nat_update_terms($node->nat, $node->title, $body, $node->taxonomy, $node->nat['related'], $node->nat['synonyms']);
       break;
     case 'delete':
       // Deleting the associated term when a node is deleted is optional.