Index: modules/update_status/update_status.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/update_status/update_status.module,v retrieving revision 1.25 diff -u -p -r1.25 update_status.module --- modules/update_status/update_status.module 13 May 2007 16:22:54 -0000 1.25 +++ modules/update_status/update_status.module 13 May 2007 16:55:23 -0000 @@ -399,7 +399,7 @@ function update_status_calculate_project break; } if (isset($release_info['terms']) && isset($release_info['terms']['Release type']) && in_array('Security update', $release_info['terms']['Release type'])) { - $remote[$project]['security update'] = TRUE; + $projects[$project]['security updates'][] = $release_info; break; } } @@ -499,7 +499,6 @@ function theme_update_status_report($dat if (!$project['title']) { continue; } - switch ($project['status']) { case UPDATE_STATUS_NOT_CURRENT: $class = 'error'; @@ -512,9 +511,7 @@ function theme_update_status_report($dat break; } - $row = ''; - - $row .= '
'; + $row = '
'; switch($project['status']) { case UPDATE_STATUS_CURRENT: $row .= t('Up to date'); @@ -527,7 +524,7 @@ function theme_update_status_report($dat $row .= ' (' . $project['reason'] . ')'; break; } - if ($project['status'] == UPDATE_STATUS_NOT_CURRENT && $project['security update']) { + if ($project['status'] == UPDATE_STATUS_NOT_CURRENT && !empty($project['security updates'])) { $row .= '
'. t('Security update required!') .'
'; } $row .= "
\n"; @@ -543,6 +540,12 @@ function theme_update_status_report($dat if ($project['existing_version'] != $project['version'] || $project['status'] != UPDATE_STATUS_CURRENT) { $row .= theme('update_status_version', $project['releases'][$project['version']], t('Recommended version:'), 'version-recommended', $project['version']); + if (!empty($project['security updates'])) { + foreach ($project['security updates'] as $security_update) { + $row .= theme('update_status_version', $security_update, t('Security update:'), 'version-security', $security_update['version']); + } + } + if ($project['version'] != $project['latest_version']) { $row .= theme('update_status_version', $project['releases'][$project['latest_version']], t('Latest version:'), 'version-latest', $project['latest_version']); }