Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #295152 by dww, Damien Tournoud, et al: fixed version comparison.

merge-requests/26/head
Dries Buytaert 2008-08-28 08:12:29 +00:00
parent 84ea54a125
commit 372acd0cd4
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/update/update.compare.inc
View File

@ -349,7 +349,7 @@ function update_calculate_project_data($available) {
}
foreach ($available[$project]['releases'] as $version => $release) {
// First, if this is the existing release, check a few conditions.
if ($projects[$project]['existing_version'] == $version) {
if ($projects[$project]['existing_version'] === $version) {
if (isset($release['terms']['Release type']) &&
in_array('Insecure', $release['terms']['Release type'])) {
$projects[$project]['status'] = UPDATE_NOT_SECURE;
@ -438,7 +438,7 @@ function update_calculate_project_data($available) {
}
// Stop searching once we hit the currently installed version.
if ($projects[$project]['existing_version'] == $version) {
if ($projects[$project]['existing_version'] === $version) {
break;
}
@ -513,7 +513,7 @@ function update_calculate_project_data($available) {
// Figure out the status, based on what we've seen and the install type.
switch ($projects[$project]['install_type']) {
case 'official':
if ($projects[$project]['existing_version'] == $projects[$project]['recommended'] || $projects[$project]['existing_version'] == $projects[$project]['latest_version']) {
if ($projects[$project]['existing_version'] === $projects[$project]['recommended'] || $projects[$project]['existing_version'] === $projects[$project]['latest_version']) {
$projects[$project]['status'] = UPDATE_CURRENT;
}
else {

16
modules/update/update.report.inc
View File

@ -109,13 +109,13 @@ function theme_update_report($data) {
$row .= "<div class=\"versions\">\n";
if (isset($project['recommended'])) {
if ($project['status'] != UPDATE_CURRENT || $project['existing_version'] != $project['recommended']) {
if ($project['status'] != UPDATE_CURRENT || $project['existing_version'] !== $project['recommended']) {
// First, figure out what to recommend.
// If there's only 1 security update and it has the same version we're
// recommending, give it the same CSS class as if it was recommended,
// but don't print out a separate "Recommended" line for this project.
if (!empty($project['security updates']) && count($project['security updates']) == 1 && $project['security updates'][0]['version'] == $project['recommended']) {
if (!empty($project['security updates']) && count($project['security updates']) == 1 && $project['security updates'][0]['version'] === $project['recommended']) {
$security_class = ' version-recommended version-recommended-strong';
}
else {
@ -123,14 +123,14 @@ function theme_update_report($data) {
$version_class = 'version-recommended';
// Apply an extra class if we're displaying both a recommended
// version and anything else for an extra visual hint.
if ($project['recommended'] != $project['latest_version']
if ($project['recommended'] !== $project['latest_version']
|| !empty($project['also'])
|| ($project['install_type'] == 'dev'
&& isset($project['dev_version'])
&& $project['latest_version'] != $project['dev_version']
&& $project['recommended'] != $project['dev_version'])
&& $project['latest_version'] !== $project['dev_version']
&& $project['recommended'] !== $project['dev_version'])
|| (isset($project['security updates'][0])
&& $project['recommended'] != $project['security updates'][0])
&& $project['recommended'] !== $project['security updates'][0])
) {
$version_class .= ' version-recommended-strong';
}
@ -145,13 +145,13 @@ function theme_update_report($data) {
}
}
if ($project['recommended'] != $project['latest_version']) {
if ($project['recommended'] !== $project['latest_version']) {
$row .= theme('update_version', $project['releases'][$project['latest_version']], t('Latest version:'), 'version-latest');
}
if ($project['install_type'] == 'dev'
&& $project['status'] != UPDATE_CURRENT
&& isset($project['dev_version'])
&& $project['recommended'] != $project['dev_version']) {
&& $project['recommended'] !== $project['dev_version']) {
$row .= theme('update_version', $project['releases'][$project['dev_version']], t('Development version:'), 'version-latest');
}
}