Index: project.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project/project.module,v retrieving revision 1.239.2.11 diff --unified -r1.239.2.11 project.module --- project.module 4 Aug 2006 03:19:50 -0000 1.239.2.11 +++ project.module 11 Aug 2006 14:50:48 -0000 @@ -817,7 +817,7 @@ * @param $key_prefix * Prefix to prepend to all keys in the returned array. */ -function project_projects_select_options($issues = TRUE, $key_prefix = NULL) { +function project_projects_select_options($issues = TRUE, $key_prefix = NULL, &$project_urls = NULL) { $projects = array(); if ($issues && module_exist('project_issue')) { $ISSUE_JOIN ='INNER JOIN {project_issue_projects} pip ON n.nid = pip.nid'; @@ -825,7 +825,7 @@ } if (project_use_taxonomy()) { $vid = _project_get_vid(); - $result = db_query(db_rewrite_sql("SELECT p.nid, n.title, d.name FROM {project_projects} p INNER JOIN {node} n ON n.nid = p.nid $ISSUE_JOIN LEFT JOIN {term_node} t ON t.nid = n.nid INNER JOIN {term_data} d ON t.tid = d.tid INNER JOIN {term_hierarchy} h ON t.tid = h.tid WHERE n.status = 1 $ISSUE_WHERE AND d.vid = %d AND h.parent = 0 GROUP BY n.title ORDER BY d.weight, n.title", 'p'), $vid); + $result = db_query(db_rewrite_sql("SELECT p.nid, n.title, d.name, p.uri FROM {project_projects} p INNER JOIN {node} n ON n.nid = p.nid $ISSUE_JOIN LEFT JOIN {term_node} t ON t.nid = n.nid INNER JOIN {term_data} d ON t.tid = d.tid INNER JOIN {term_hierarchy} h ON t.tid = h.tid WHERE n.status = 1 $ISSUE_WHERE AND d.vid = %d AND h.parent = 0 GROUP BY n.title ORDER BY d.weight, n.title", 'p'), $vid); while ($project = db_fetch_object($result)) { if (isset($project->name)) { if (!isset($projects[$project->name])) { @@ -836,12 +836,18 @@ else { $projects[$key_prefix . $project->nid] = $project->title; } + if (is_array($project_urls)) { + $project_urls[$project->uri] = $project->nid; + } } } else { - $result = db_query(db_rewrite_sql("SELECT p.nid, n.title FROM {project_projects} p INNER JOIN {node} n ON n.nid = p.nid $ISSUE_JOIN WHERE n.status = 1 $ISSUE_WHERE", 'p')); + $result = db_query(db_rewrite_sql("SELECT p.nid, p.uri, n.title FROM {project_projects} p INNER JOIN {node} n ON n.nid = p.nid $ISSUE_JOIN WHERE n.status = 1 $ISSUE_WHERE", 'p')); while ($project = db_fetch_object($result)) { $projects[$key_prefix . $project->nid] = $project->title; + if (is_array($project_urls)) { + $project_urls[$project->uri] = $project->nid; + } } } return $projects;