diff --git a/include/branches.inc b/include/branches.inc index c5487262d..9b128b93d 100644 --- a/include/branches.inc +++ b/include/branches.inc @@ -122,14 +122,18 @@ function get_all_branches() { return $branches; } -function get_active_branches() { +function get_active_branches($include_recent_eols = true) { $branches = array(); $now = new DateTime; foreach ($GLOBALS['RELEASES'] as $major => $releases) { foreach ($releases as $version => $release) { if ($branch = version_number_to_branch($version)) { - if ($now < get_branch_security_eol_date($branch)->add($GLOBALS['KEEP_EOL'])) { + $threshold = get_branch_security_eol_date($branch); + if ($include_recent_eols) { + $threshold->add($GLOBALS['KEEP_EOL']); + } + if ($now < $threshold) { $branches[$major][$branch] = $release; $branches[$major][$branch]['version'] = $version; } diff --git a/supported-versions.php b/supported-versions.php index d7c5c4c4b..aa9511390 100644 --- a/supported-versions.php +++ b/supported-versions.php @@ -47,7 +47,7 @@ $VERSION_NOTES = array(
- $releases): ?> + $releases): ?> $release): ?>