Index: modules/path/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.module,v
retrieving revision 1.138.2.3
diff -u -r1.138.2.3 path.module
--- modules/path/path.module	22 Nov 2008 10:49:15 -0000	1.138.2.3
+++ modules/path/path.module	20 Aug 2010 10:51:38 -0000
@@ -162,7 +162,8 @@
         break;
 
       case 'update':
-        path_set_alias('node/'. $node->nid, isset($node->path) ? $node->path : NULL, isset($node->pid) ? $node->pid : NULL, $language);
+        $pid = db_result(db_query("SELECT pid FROM {url_alias} WHERE src = '%s' AND language = '%s'", 'node/'. $node->nid, $node->language));
+        path_set_alias('node/'. $node->nid, isset($node->path) ? $node->path : NULL, $pid, $language);
         break;
 
       case 'delete':
@@ -197,12 +198,6 @@
       '#collapsed' => TRUE,
       '#description' => t('Optionally specify an alternative URL by which this node can be accessed. For example, type "about" when writing an about page. Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.'),
     );
-    if ($path) {
-      $form['path']['pid'] = array(
-        '#type' => 'value',
-        '#value' => db_result(db_query("SELECT pid FROM {url_alias} WHERE dst = '%s' AND language = '%s'", $path, $form['#node']->language))
-      );
-    }
   }
 }
 
