Index: modules/project/project.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project/project.module,v
retrieving revision 1.239.2.13.2.15
diff -u -p -r1.239.2.13.2.15 project.module
--- modules/project/project.module	5 Dec 2006 11:38:16 -0000	1.239.2.13.2.15
+++ modules/project/project.module	6 Dec 2006 03:53:11 -0000
@@ -621,25 +621,20 @@ function project_page_overview($termname
     }
 
     // Make sure we have the latest release
-    // TODO: this needs help to handle projects with N branches for the
-    // same compatibility version...
-    if ($project->release_count > 1) {
-      unset($values);
-      $values[] = $project->nid;
-      if ($version != -1) {
-        $VERSION_JOIN = 'INNER JOIN {term_node} t ON p.nid = t.nid';
-        $VERSION_WHERE = 'AND t.tid = %d';
-        $values[] = $version;
-      }
-      $latest = db_fetch_object(db_query_range("SELECT file_path, version, file_date FROM {project_release_nodes} p $VERSION_JOIN WHERE p.pid = %d $VERSION_WHERE ORDER BY file_date DESC", $values, 0, 1));
+    if ($project->release_count > 1 && $version != -1) {
+      $latest = db_fetch_object(db_query_range("SELECT file_path, version, file_date FROM {project_release_nodes} p INNER JOIN {term_node} t ON p.nid = t.nid LEFT JOIN {project_release_default_versions} prdv ON p.pid = prdv.nid AND prdv.tid = t.tid AND prdv.major = p.version_major WHERE p.pid = %d AND t.tid = %d ORDER BY prdv.nid DESC, p.rebuild ASC, p.version_major ASC, p.version_minor DESC, p.version_patch DESC, p.file_date DESC", $project->nid, $version, 0, 1));
       $project->file_path = $latest->file_path;
       $project->version = $latest->version;
     }
 
     $project->links = array();
-
-    if ($project->file_path) {
-      $project->links[] = l(t('Download'), file_create_url($project->file_path));
+    if ($version != -1) {
+      if ($project->file_path) {
+        $project->links[] = l(t('Download'), file_create_url($project->file_path));
+      }
+    }
+    else {
+      $project->download_table = project_release_table($project, 1, 1, FALSE, 'default', t('Default versions'));
     }
     $project->links[] = l(t('Find out more'), "node/$project->nid");
 
@@ -869,6 +864,9 @@ function theme_project_summary($project)
   }
   $output .= $project->body;
   $output .= theme('links', $project->links);
+  if ($project->download_table) {
+    $output .= $project->download_table;
+  }
   if ($project->terms) {
     $output .= '<br />' . theme('links', $project->terms);
   }