--- project_release.module	2007-06-07 17:49:45.000000000 -0500
+++ project_release.module.org	2007-06-07 16:47:06.000000000 -0500
@@ -190,7 +190,7 @@ function project_release_access($op, $no
       // We can't just use project_project_access() here, since we
       // need to check access to the project itself, not the release
       // node, so we use the helper method and pass the project id.
-      return project_check_admin_access($node->pro_id);
+      return project_check_admin_access($node->pid);
     case 'delete':
       // No one should ever delete a release node, only unpublish it.
       return FALSE;
@@ -223,10 +223,10 @@ function project_release_form($release) 
       module_invoke_all('exit');
       exit;
     }
-    $release->pro_id = arg(3);
-    $project = node_load($release->pro_id);
+    $release->pid = arg(3);
+    $project = node_load($release->pid);
     if (!isset($project) || $project->type != 'project_project') {
-      drupal_set_message(t('Node !nid is not a valid project.', array('!nid' => $release->pro_id)));
+      drupal_set_message(t('Node !nid is not a valid project.', array('!nid' => $release->pid)));
       drupal_not_found();
       module_invoke_all('exit');
       exit;
@@ -248,7 +248,7 @@ function project_release_form($release) 
     global $user;
     $admin = user_access('administer projects');
     $is_edit = true;
-    $project->nid = $release->pro_id;
+    $project->nid = $release->pid;
     $format = project_release_get_version_format($project);
   }
 
@@ -269,9 +269,9 @@ function project_release_form($release) 
   _project_release_form_add_text_element($form['rel_id']['title'], t('Title'), $release->title, $is_edit, $admin, true, 40);
   _project_release_form_add_text_element($form['rel_id']['version'], t('Version string'), $release->version, $is_edit, $admin, true, 20);
 
-  $form['pro_id'] = array(
+  $form['pid'] = array(
     '#type' => 'value',
-    '#value' => $release->pro_id,
+    '#value' => $release->pid,
   );
   $form['version']['num'] = array(
     '#type' => 'fieldset',
@@ -486,8 +486,8 @@ function project_release_validate(&$edit
   if (isset($edit->project->uri)) {
     $project_name = $edit->project->uri;
   }
-  elseif (isset($edit->pro_id)) {
-    $project_name = db_result(db_query("SELECT uri FROM {project_projects} WHERE nid = %d", $edit->pro_id));
+  elseif (isset($edit->pid)) {
+    $project_name = db_result(db_query("SELECT uri FROM {project_projects} WHERE nid = %d", $edit->pid));
   }
   if (isset($edit->title)) {
     // TODO: Magic re-setting to "%project_name %version" ??
@@ -561,11 +561,11 @@ function project_release_db_save($node, 
   if (isset($node->version_patch) && !is_numeric($node->version_patch)) {
     unset($node->version_patch);
   }
-  $types = array( 'pro_id' => "%d", 'version' => "'%s'", 'tag' => "'%s'",
+  $types = array( 'pid' => "%d", 'version' => "'%s'", 'tag' => "'%s'",
     'file_path' => "'%s'", 'file_date' => "%d", 'file_hash' => "'%s'",
     'rebuild' => "%d",
   );
-  $values = array( 'pro_id' => $node->pro_id, 'version' => $node->version,
+  $values = array( 'pid' => $node->pid, 'version' => $node->version,
     'tag' => $node->tag, 'file_path' => $node->file_path,
     'file_date' => $node->file_date, 'file_hash' => $node->file_hash,
     'rebuild' => $node->rebuild,
@@ -602,9 +602,9 @@ function project_release_db_save($node, 
     $vid = _project_release_get_api_vid();
     if (isset($node->taxonomy[$vid])) {
       $tid = $node->taxonomy[$vid];
-      $has_default = db_result(db_query("SELECT COUNT(*) FROM {project_release_default_versions} WHERE nid = %d AND tid = %d", $node->pro_id, $tid));
+      $has_default = db_result(db_query("SELECT COUNT(*) FROM {project_release_default_versions} WHERE nid = %d AND tid = %d", $node->pid, $tid));
       if (!$has_default) {
-        db_query("INSERT INTO {project_release_default_versions} (nid, tid, major) VALUES (%d, %d, %d)", $node->pro_id, $tid, $node->version_major);
+        db_query("INSERT INTO {project_release_default_versions} (nid, tid, major) VALUES (%d, %d, %d)", $node->pid, $tid, $node->version_major);
       }
     }
   }
@@ -666,7 +666,7 @@ function project_release_get_version($re
     $node = $project;
   }
   else {
-    $node->nid = $release->pro_id;
+    $node->nid = $release->pid;
   }
   $variables = array();
   foreach (array('major', 'minor', 'patch', 'extra') as $field) {
@@ -710,7 +710,7 @@ function project_release_get_version($re
  */
 function project_release_view($node, $teaser = FALSE, $page = FALSE) {
   $node = node_prepare($node, $teaser);
-  $project = node_load($node->pro_id);
+  $project = node_load($node->pid);
 
   if ($page) {
     // Breadcrumb navigation
@@ -771,7 +771,7 @@ function project_release_get_releases($p
   if ($filter_by == 'files') {
     $where = "AND (r.file_path <> '')";
   }
-  $result = db_query(db_rewrite_sql("SELECT n.nid, r.* FROM {node} n INNER JOIN {project_release_nodes} r ON r.nid = n.nid WHERE (r.pro_id = %d) AND (n.status = 1) $where ORDER BY $order_by DESC"), $project->nid);
+  $result = db_query(db_rewrite_sql("SELECT n.nid, r.* FROM {node} n INNER JOIN {project_release_nodes} r ON r.nid = n.nid WHERE (r.pid = %d) AND (n.status = 1) $where ORDER BY $order_by DESC"), $project->nid);
   $releases = array();
   while ($obj = db_fetch_object($result)) {
     if ($nodes) {
@@ -955,7 +955,7 @@ function project_release_project_edit_fo
         $major = $version->major;
         $node->default_versions[$tid] = $major;
       }
-      $result = db_query(db_rewrite_sql("SELECT n.nid, tn.tid, td.name, r.* FROM {node} n INNER JOIN {project_release_nodes} r ON r.nid = n.nid INNER JOIN {term_node} tn ON tn.nid = r.nid INNER JOIN {term_data} td ON tn.tid = td.tid WHERE (r.pro_id = %d) AND (n.status = 1) AND (r.file_path <> '') ORDER BY tn.tid, r.rebuild, r.version_major DESC, r.version_minor DESC, r.version_patch DESC, r.file_date DESC"), $node->nid);
+      $result = db_query(db_rewrite_sql("SELECT n.nid, tn.tid, td.name, r.* FROM {node} n INNER JOIN {project_release_nodes} r ON r.nid = n.nid INNER JOIN {term_node} tn ON tn.nid = r.nid INNER JOIN {term_data} td ON tn.tid = td.tid WHERE (r.pid = %d) AND (n.status = 1) AND (r.file_path <> '') ORDER BY tn.tid, r.rebuild, r.version_major DESC, r.version_minor DESC, r.version_patch DESC, r.file_date DESC"), $node->nid);
       while ($rel = db_fetch_object($result)) {
         $tid = $rel->tid;
         $major = $rel->version_major;
@@ -1010,8 +1010,7 @@ function project_release_project_edit_fo
         '#maxlength' => 255,
         '#description' => t('Customize the format of the version strings for releases of this project.') .' '. PROJECT_RELEASE_VERSION_FORMAT_HELP .' '. t('If blank, this project will use the site-wide default (currently set to: %default)', array('%default' => variable_get('project_release_default_version_format', PROJECT_RELEASE_DEFAULT_VERSION_FORMAT))),
       );
-$setting_valid = array('project_release_project_edit_form_validate' => array());
-$form['#validate'] = isset($form['#validate']) ? array_merge($form['#validate'], $setting_valid) : $setting_valid;
+      $form['#validate'] = array_merge($form['#validate'], array('project_release_project_edit_form_validate' => array()));
     }
     $vocab = taxonomy_get_vocabulary(_project_release_get_api_vid());
     $vocab = isset($vocab) ? theme('placeholder', $vocab->name) : t('version');
@@ -1119,8 +1118,8 @@ function project_release_alter_release_f
   }
   else {
 /*
-    if (isset($node->pro_id)) {
-      $project->nid = $node->pro_id;
+    if (isset($node->pid)) {
+      $project->nid = $node->pid;
     }
     elseif (arg(1) == 'add' && is_numeric(arg(3))) {
       $project->nid = arg(3);
@@ -1280,7 +1279,7 @@ function project_release_table($project,
 
   if ($table_type == 'defaults') {
     if ($tids) {
-      $join .= ' INNER JOIN {project_release_default_versions} prdv ON prdv.nid = r.pro_id AND prdv.tid = tn.tid AND prdv.major = r.version_major ';
+      $join .= ' INNER JOIN {project_release_default_versions} prdv ON prdv.nid = r.pid AND prdv.tid = tn.tid AND prdv.major = r.version_major ';
     }
     else {
       // TODO
@@ -1315,7 +1314,7 @@ function project_release_table($project,
   $result = db_query(db_rewrite_sql(
     "SELECT n.nid, $select r.* FROM {node} n " .
     "INNER JOIN {project_release_nodes} r ON r.nid = n.nid " . $join . 
-    "WHERE (r.pro_id = %d) AND (n.status = 1) " . $where . ' ' . $order_by),
+    "WHERE (r.pid = %d) AND (n.status = 1) " . $where . ' ' . $order_by),
     $project->nid);
 
   if (!db_num_rows($result) && $release_type != 'official' && $tids) {
@@ -1324,7 +1323,7 @@ function project_release_table($project,
     $result = db_query(db_rewrite_sql(
       "SELECT n.nid, r.* FROM {node} n " .
       "INNER JOIN {project_release_nodes} r ON r.nid = n.nid " .
-      "WHERE (r.pro_id = %d) AND (n.status = 1) " . $where), $project->nid);
+      "WHERE (r.pid = %d) AND (n.status = 1) " . $where), $project->nid);
   }
 
   $items = array();
@@ -1486,13 +1485,13 @@ function project_release_exists($version
     $tid = $version->version_api_tid;
   }
 
-  $sql = 'SELECT * FROM {project_release_nodes} p'. $taxo_join .' WHERE p.pro_id = %d';
+  $sql = 'SELECT * FROM {project_release_nodes} p'. $taxo_join .' WHERE p.pid = %d';
   foreach ($types as $field => $type) {
     $sql .= " AND p.$field = $type";
   }
   $sql .= $taxo_where;
-  // we put pro_id as the first WHERE, so stick it on the front
-  $values = array_merge(array('pro_id' => $version->pro_id), $values);
+  // we put pid as the first WHERE, so stick it on the front
+  $values = array_merge(array('pid' => $version->pid), $values);
   return db_num_rows(db_query($sql, $values));
 }