diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2008-02-03 19:34:02 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2008-02-03 19:34:02 +0000 |
| commit | 9bb28aa8592af8180da43759e079e70a6745eaad (patch) | |
| tree | 456f2ee475e9d9b8f7df81d0a805e8601ca94943 /modules | |
| parent | 78f2053c326b9e19553af7d6a92a82b243ba3219 (diff) | |
| download | brdo-9bb28aa8592af8180da43759e079e70a6745eaad.tar.gz brdo-9bb28aa8592af8180da43759e079e70a6745eaad.tar.bz2 | |
#216750 by dww: Security releases from higher branches were not ignored in all cases (critical)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/update/update.compare.inc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/modules/update/update.compare.inc b/modules/update/update.compare.inc index 5c7c914f9..a0cf66c3f 100644 --- a/modules/update/update.compare.inc +++ b/modules/update/update.compare.inc @@ -390,13 +390,14 @@ function update_calculate_project_data($available) { // See if this is a higher major version than our target and yet still // supported. If so, record it as an "Also available" release. - if ($release['version_major'] > $target_major && - in_array($release['version_major'], $supported_majors)) { - if (!isset($available[$project]['also'])) { - $available[$project]['also'] = array(); - } - if (!isset($available[$project]['also'][$release['version_major']])) { - $available[$project]['also'][$release['version_major']] = $version; + if ($release['version_major'] > $target_major) { + if (in_array($release['version_major'], $supported_majors)) { + if (!isset($available[$project]['also'])) { + $available[$project]['also'] = array(); + } + if (!isset($available[$project]['also'][$release['version_major']])) { + $available[$project]['also'][$release['version_major']] = $version; + } } // Otherwise, this release can't matter to us, since it's neither // from the release series we're currently using nor the recommended |