Incorrect path when inputing path in node form.

Have found this bug 1 or 2 month ago. The problem arrived when I was developing user frinedly URLs using custom URL rewrite. Have found this bug within beta 4 & as far as I see its beta5 & 6th issue too.

So. Take a look at the followinf code in path.module (function path_nodeapi()):

      case 'load':
        $path = "node/$node->nid";
        $alias = drupal_get_path_alias($path);
        if ($alias != $path) {
          $node->path = $alias;
        }
        break;

It compares alias with path & if we have them different, it assigns node->path member to an alias. Then node->path will be appearing in node edit form. If I have my custom url rewrite changing path --> my custom url rewrite will appear in that edit box. And after user applies changes to node, this alias would be added to DB. It was my alias, not yours...:)

I have fixed the problem with the next code changes (if some core developers are interested):

Change path.module path_nodeapi callback to next:

function path_nodeapi(&$node, $op, $arg) {
  if (user_access('create url aliases') || user_access('administer url aliases')) {
    switch ($op) {
      case 'validate':
        $node->path = trim($node->path);
        if ($node->path && !valid_url($node->path)) {
          form_set_error('path', t('The path is invalid.'));
        }
        else if (db_result(db_query("SELECT COUNT(dst) FROM {url_alias} WHERE dst = '%s' AND src != '%s'", $node->path, "node/$node->nid"))) {
          form_set_error('path', t('The path is already in use.'));
        }
        break;

      case 'load':
        $path = "node/$node->nid";
// doques: update
//        $alias = drupal_get_path_alias($path);
        $in_database = FALSE;
        $alias = drupal_get_path_alias($path, &$in_database);
// The next code from Drupal 4.7b4 is incorrect, because I can change
// path alias using custom_url_rewrite() callback for example.
//        if ($alias != $path) {
        if ($in_database && $alias != $path) {
// -- doques: update
          $node->path = $alias;
        }
        break;

      case 'insert':
        // Don't try to insert if path is NULL.  We may have already set
        // the alias ahead of time.
        if ($node->path) {
          path_set_alias("node/$node->nid", $node->path);
        }
        break;

      case 'update':
        path_set_alias("node/$node->nid", $node->path, $node->pid);
        break;

      case 'delete':
        $path = "node/$node->nid";
        if (drupal_get_path_alias($path) != $path) {
          path_set_alias($path);
        }
        break;
    }
  }
}

Also, you'll need to alter your drupal_get_path_alias in path.inc (altered beta4 code):

function drupal_get_path_alias($path, $in_database = FALSE) {
// $in_database is a helper parameter for path_nodeapi() callback.
// -- doques: update
  $result = $path;
  if ($alias = drupal_lookup_path('alias', $path)) {
// doques: add
    if($result != $alias) {
      $in_database = TRUE;
    }
// -- doques: add
    $result = $alias;
  }
  if (function_exists('custom_url_rewrite')) {
    $result = custom_url_rewrite('alias', $result, $path);
  }

// doques: add
//  $result = drupal_invoke_url_rewrite_('alias', $result, $path);
// -- doques: add

  return $result;
}