Index: nodewords.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords.admin.inc,v
retrieving revision 1.1.2.136
diff -u -p -r1.1.2.136 nodewords.admin.inc
--- nodewords.admin.inc	2 Jan 2010 05:29:02 -0000	1.1.2.136
+++ nodewords.admin.inc	3 Jan 2010 18:46:34 -0000
@@ -213,9 +213,10 @@ function nodewords_pages_edit_validate($
 
   if (($path = trim($form_state['values']['path'])) != '') {
     $bool = db_result(
-      db_query("SELECT 1 FROM {nodewords_custom} WHERE path = '%s' AND pid <> %d",
+      db_query_range("SELECT 1 FROM {nodewords_custom} WHERE path = '%s' AND pid <> %d",
         $path,
-        isset($form_state['values']['pid']) ? $form_state['values']['pid'] : 0
+        isset($form_state['values']['pid']) ? $form_state['values']['pid'] : 0,
+        0, 1
       )
     );
 
@@ -234,8 +235,19 @@ function nodewords_pages_edit_validate($
 function nodewords_pages_edit_submit($form, &$form_state) {
   $form_state['values']['path'] = trim($form_state['values']['path']);
 
-  drupal_write_record('nodewords_custom', $form_state['values'], isset($form_state['values']['pid']) ? 'pid' : array());
-  nodewords_save_tags(NODEWORDS_TYPE_PAGE, $form_state['values']['pid'], $form_state['values']['nodewords'], TRUE);
+  $row = new stdClass();
+
+  if (isset($form_state['values']['pid'])) {
+    $row->pid = $form_state['values']['pid'];
+  }
+
+  $row->name = $form_state['values']['name'];
+  $row->path = $form_state['values']['path'];
+  $row->weight = $form_state['values']['weight'];
+  $row->enabled = $form_state['values']['enabled'];
+
+  drupal_write_record('nodewords_custom', $row, isset($row->pid) ? 'pid' : array());
+  nodewords_save_tags(NODEWORDS_TYPE_PAGE, $row->pid, $form_state['values']['nodewords'], TRUE);
 
   drupal_set_message(t('The configuration options have been saved.'));
 
Index: nodewords.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords.module,v
retrieving revision 1.57.2.295
diff -u -p -r1.57.2.295 nodewords.module
--- nodewords.module	3 Jan 2010 16:16:05 -0000	1.57.2.295
+++ nodewords.module	3 Jan 2010 18:46:34 -0000
@@ -1376,7 +1376,7 @@ function _nodewords_get_pages_data($id =
     $result = db_query("SELECT * FROM {nodewords_custom} ORDER BY weight ASC");
 
     while ($page = db_fetch_object($result)) {
-      $page->tags = nodewords_load_tags(NODEWORDS_TYPE_PAGE, $page->path);
+      $page->tags = nodewords_load_tags(NODEWORDS_TYPE_PAGE, $page->pid);
 
       $pages[$page->pid] = $page;
     }