Index: casetracker.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/casetracker/casetracker.module,v
retrieving revision 1.68.2.3
diff -u -p -r1.68.2.3 casetracker.module
--- casetracker.module	20 Dec 2006 02:43:13 -0000	1.68.2.3
+++ casetracker.module	3 Mar 2007 00:52:01 -0000
@@ -232,8 +232,8 @@ function casetracker_nodeapi(&$node, $op
     case 'insert':
       // cases: generate a case ID and send it along.
       if (in_array($node->type, variable_get('casetracker_case_node_types', array('casetracker_case')), TRUE)) {
-        $node->case_number = _casetracker_next_case_number($node->pid); // $node->case_number is used in casetracker_mail_send().
-        db_query("INSERT INTO {casetracker_case} (nid, vid, pid, case_priority_id, case_type_id, case_status_id, assign_to, case_number) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)", $node->nid, $node->vid, $node->pid, $node->case_priority_id, $node->case_type_id, $node->case_status_id, casetracker_get_uid($node->assign_to), $node->case_number);
+        $node->case_number = _casetracker_next_case_number($node->ctpid); // $node->case_number is used in casetracker_mail_send().
+        db_query("INSERT INTO {casetracker_case} (nid, vid, pid, case_priority_id, case_type_id, case_status_id, assign_to, case_number) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)", $node->nid, $node->vid, $node->ctpid, $node->case_priority_id, $node->case_type_id, $node->case_status_id, casetracker_get_uid($node->assign_to), $node->case_number);
       }
 
       // projects: associate a node with our project number.
@@ -261,8 +261,8 @@ function casetracker_nodeapi(&$node, $op
       // cases: update our case with the latest data.
       if (in_array($node->type, variable_get('casetracker_case_node_types', array('casetracker_case')), TRUE)) {
         $result = $node->revision
-          ? db_query("INSERT INTO {casetracker_case} (nid, vid, pid, case_priority_id, case_type_id, case_status_id, assign_to, case_number) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)", $node->nid, $node->vid, $node->pid, $node->case_priority_id, $node->case_type_id, $node->case_status_id, casetracker_get_uid($node->assign_to), $node->case_number)
-          : db_query('UPDATE {casetracker_case} SET pid = %d, case_priority_id = %d, case_type_id = %d, case_status_id = %d, assign_to = %d, vid = %d WHERE nid = %d AND vid = %d', $node->pid, $node->case_priority_id, $node->case_type_id, $node->case_status_id, casetracker_get_uid($node->assign_to), $node->vid, $node->nid, $node->vid);
+          ? db_query("INSERT INTO {casetracker_case} (nid, vid, pid, case_priority_id, case_type_id, case_status_id, assign_to, case_number) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)", $node->nid, $node->vid, $node->ctpid, $node->case_priority_id, $node->case_type_id, $node->case_status_id, casetracker_get_uid($node->assign_to), $node->case_number)
+          : db_query('UPDATE {casetracker_case} SET pid = %d, case_priority_id = %d, case_type_id = %d, case_status_id = %d, assign_to = %d, vid = %d WHERE nid = %d AND vid = %d', $node->ctpid, $node->case_priority_id, $node->case_type_id, $node->case_status_id, casetracker_get_uid($node->assign_to), $node->vid, $node->nid, $node->vid);
       }
 
       // projects: if revisions are enabled, associate the new revision to our project number.
@@ -331,7 +331,7 @@ function casetracker_case_form_common(&$
       '#prefix'            => '<div id="project-information">',
       '#suffix'            => '</div>', // no particular reason.
     );
-    $form['casetracker_project_information']['pid'] = array(
+    $form['casetracker_project_information']['ctpid'] = array(
       '#title'             => t('Project'),
       '#type'              => 'select',
       '#default_value'     => $default_project,
@@ -339,7 +339,7 @@ function casetracker_case_form_common(&$
     );
   }
   else {
-    $form['casetracker_project_information']['pid'] = array(
+    $form['casetracker_project_information']['ctpid'] = array(
       '#type'              => 'hidden', // default value, or the only the project ID in the project_options array.
       '#default_value'     => isset($default_project) ? $default_project : array_shift(array_keys($project_options)),
       '#options'           => $project_options,
@@ -969,7 +969,7 @@ function casetracker_comment(&$comment, 
     // note: we're using 'prid' here for our project ID because the comment forms
     // already use 'pid' to represent the parent comment of a reply. be friendly!
     $case_data['old']->prid = $node->pid;
-    $case_data['new']->prid = $comment['prid'];
+    $case_data['new']->prid = $comment['ctpid'];
 
     foreach ($case_fields as $case_field) {
       $case_data['old']->$case_field = $node->$case_field;
@@ -1065,8 +1065,8 @@ function casetracker_form_alter($form_id
 
     // we use 'pid' for a project ID, but the comment form uses 'pid' for
     // the parent comment (in a reply). we'll change ours to 'prid'. sigh.
-    $form['casetracker_project_information']['prid'] = $form['casetracker_project_information']['pid'];
-    unset($form['casetracker_project_information']['pid']); // cater to this in casetracker_comment().
+//    $form['casetracker_project_information']['prid'] = $form['casetracker_project_information']['pid'];
+//    unset($form['casetracker_project_information']['pid']); // cater to this in casetracker_comment().
 
     // necessary for our casetracker_comment() callback.
     $form['nid'] = array('#type' => 'hidden', '#value' => $node->nid, );