Index: modules/project/project.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/project/project.module,v retrieving revision 1.239.2.19 diff -u -p -r1.239.2.19 project.module --- modules/project/project.module 12 Dec 2006 16:42:56 -0000 1.239.2.19 +++ modules/project/project.module 19 Dec 2006 00:26:03 -0000 @@ -430,22 +430,11 @@ function project_page_overview($termname project_project_set_breadcrumb(); $sort_methods = module_invoke_all('project_sort_methods', 'methods'); - // Read in requested version, if any. - if ($_POST['edit']['rid']) { - $version = $_POST['edit']['rid']; - } - else if ($_SESSION['project_version']) { - $version = $_SESSION['project_version']; - } - else { - $version = variable_get('project_release_overview', -1); - } - $form = project_version_filter_form($version); - $version_form = drupal_get_form('project_version_filter_form', $form); - if ($_POST['edit']['rid']) { - $_SESSION['project_version'] = $form_values['rid']; - } if (variable_get('project_browse_releases', 0)) { + // Read in requested version, if any. + $version = isset($_SESSION['project_version']) ? $_SESSION['project_version'] : variable_get('project_release_overview', -1); + $form = project_version_filter_form($version); + $version_form = drupal_get_form('project_version_filter_form', $form); $output .= $version_form; } @@ -855,6 +844,9 @@ function project_projects_select_options } function project_version_filter_form($version) { + if (is_null($version)) { + $version = isset($_SESSION['project_version']) ? $_SESSION['project_version'] : variable_get('project_release_overview', -1); + } $releases = array(-1 => t('')) + project_releases_list(); $form['rid'] = array( '#type' => 'select', @@ -862,12 +854,18 @@ function project_version_filter_form($ve '#options' => $releases ); $form['submit'] = array( - '#type' => 'button', + '#type' => 'submit', '#value' => t('Go') ); return $form; } +function project_version_filter_form_submit($form_id, $form_values) { + if (isset($form_values['rid'])) { + $_SESSION['project_version'] = $form_values['rid']; + } +} + function theme_project_version_filter_form($form) { $output = '
' . t('Filter by version:') . form_render($form) . '
'; return $output;