--- nodewords.module.orig	2006-02-04 01:02:56.000000000 +0700
+++ nodewords.module	2006-02-04 00:15:19.000000000 +0700
@@ -73,10 +73,10 @@
 
     case 'insert':
     case 'update':
-      $node->nodewords['abstract'] = $node->abstract;
-      $node->nodewords['copyright'] = $node->copyright;
-      $node->nodewords['description'] = $node->description;
-      $node->nodewords['keywords'] = $node->keywords;
+      $node->nodewords['abstract'] = $node->nodewords_abstract;
+      $node->nodewords['copyright'] = $node->nodewords_copyright;
+      $node->nodewords['description'] = $node->nodewords_description;
+      $node->nodewords['keywords'] = $node->nodewords_keywords;
       _nodewords_set('node', $node->nid, $node->nodewords);
       break;
 
@@ -214,7 +214,7 @@
 /**
  * Implementation of hook_taxonomy().
  */
-function nodewords_taxonomy($op, $type, $object) {
+function nodewords_taxonomy($op, $type, $object = NULL) {
   if ($type == 'term') {
     $id = $object['tid'];
   }
@@ -385,67 +385,66 @@
  * Create a form
  */
 function nodewords_form_alter($form_id, &$form) {
-  if (!(user_access('administer meta tags') && isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id)) {
-    return;
-  }
-  $node = $form['#node'];
-  $tags = _nodewords_load('node', $node->nid);
-  $settings = _nodewords_get_settings();
-
-  $form['nodewords'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Meta tags'),
-    '#collapsible' => TRUE,
-    '#collapsed' => empty($tags['abstract']) && empty($tags['copyright']) && empty($tags['description']) && empty($tags['keywords']),
-    '#weight' => 40,
-  );
-
-  if ($settings['edit']['abstract']) {
-    $form['nodewords']['abstract'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Abstract'),
-      '#default_value' => $tags['abstract'],
-      '#size' => 60,
-      '#maxlength' => $settings['max_size'],
-      '#description' => t('Enter a short abstract for this node. Typically it is one sentence.'),
+  if (user_access('administer meta tags') && isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
+    $node = $form['#node'];
+    $tags = _nodewords_load('node', $node->nid);
+    $settings = _nodewords_get_settings();
+
+    $form['nodewords'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Meta tags'),
+      '#collapsible' => TRUE,
+      '#collapsed' => empty($tags['abstract']) && empty($tags['copyright']) && empty($tags['description']) && empty($tags['keywords']),
+      '#weight' => 40,
     );
-  }
 
-  if ($settings['edit']['copyright']) {
-    $form['nodewords']['copyright'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Copyright'),
-      '#default_value' => $tags['copyright'],
-      '#size' => 60,
-      '#maxlength' => $settings['max_size'],
-      '#description' => t('Enter a short copyright statement for this node.'),
-    );
-  }
+    if ($settings['edit']['abstract']) {
+      $form['nodewords']['nodewords_abstract'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Abstract'),
+        '#default_value' => $tags['abstract'],
+        '#size' => 60,
+        '#maxlength' => $settings['max_size'],
+        '#description' => t('Enter a short abstract for this node. Typically it is one sentence.'),
+      );
+    }
 
-  if ($settings['edit']['description']) {
-    $form['nodewords']['description'] = array(
-      '#type' => 'textarea',
-      '#title' => t('Description'),
-      '#default_value' => $tags['description'],
-      '#cols' => 60,
-      '#rows' => 6,
-      '#description' => t('Enter a description for this node. Limit your description to about 20 words, with a maximum of %count characters. It should not contain any HTML tags or other formatting.', array('%count' => $settings['max_size'])) . ($settings['use_teaser'] ? ' '.t('When you leave this field empty, the teaser will be used as description.') : ''),
-    );
-  }
+    if ($settings['edit']['copyright']) {
+      $form['nodewords']['nodewords_copyright'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Copyright'),
+        '#default_value' => $tags['copyright'],
+        '#size' => 60,
+        '#maxlength' => $settings['max_size'],
+        '#description' => t('Enter a short copyright statement for this node.'),
+      );
+    }
 
-  if ($settings['edit']['keywords'] && $type != 'term' && $type != 'vocabulary') {
-    $form['nodewords']['keywords'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Keywords'),
-      '#default_value' => $tags['keywords'],
-      '#size' => 60,
-      '#maxlength' => $settings['max_size'],
-      '#description' => t('Enter a comma seperated list of keywords for this page. Avoid duplication of words as this will lower your search engine ranking.'),
-    );
-  }
+    if ($settings['edit']['description']) {
+      $form['nodewords']['nodewords_description'] = array(
+        '#type' => 'textarea',
+        '#title' => t('Description'),
+        '#default_value' => $tags['description'],
+        '#cols' => 60,
+        '#rows' => 6,
+        '#description' => t('Enter a description for this node. Limit your description to about 20 words, with a maximum of %count characters. It should not contain any HTML tags or other formatting.', array('%count' => $settings['max_size'])) . ($settings['use_teaser'] ? ' '.t('When you leave this field empty, the teaser will be used as description.') : ''),
+      );
+    }
+
+    if ($settings['edit']['keywords'] && $type != 'term' && $type != 'vocabulary') {
+      $form['nodewords']['nodewords_keywords'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Keywords'),
+        '#default_value' => $tags['keywords'],
+        '#size' => 60,
+        '#maxlength' => $settings['max_size'],
+        '#description' => t('Enter a comma seperated list of keywords for this page. Avoid duplication of words as this will lower your search engine ranking.'),
+      );
+    }
 
-  if (count($form['nodewords']) == 0) {
-    unset($form['nodewords']);
+    if (count($form['nodewords']) == 0) {
+      unset($form['nodewords']);
+    }
   }
 }