From 9bb28aa8592af8180da43759e079e70a6745eaad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Sun, 3 Feb 2008 19:34:02 +0000
Subject: [PATCH] #216750 by dww: Security releases from higher branches were
not ignored in all cases (critical)
---
modules/update/update.compare.inc | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/modules/update/update.compare.inc b/modules/update/update.compare.inc
index 5c7c914f9c72..a0cf66c3f762 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
--
GitLab