makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 21:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15142] Handle versions for unmatched branches

Browse source 
PHPBB3-15142
This commit is contained in:
Matt Friedman 2017-03-24 11:45:11 -07:00
parent 91ab27ecc9
commit afddb81acf
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/phpbb/version_helper.php
View file

@ -274,12 +274,20 @@ class version_helper
$branches = array_filter(array_keys($versions), function($branch) use ($self, $current_branch) { $branches = array_filter(array_keys($versions), function($branch) use ($self, $current_branch) {
return $self->compare($branch, $current_branch, '>='); return $self->compare($branch, $current_branch, '>=');
}); });
$versions = array_intersect_key($versions, array_flip($branches)); $versions = !empty($branches) ? array_intersect_key($versions, array_flip($branches)) : $versions;
if (!empty($branches))
{
$versions = array_intersect_key($versions, array_flip($branches));
}
else
{
// If branches are empty, it means the current phpBB branch is newer than any branch the
// extension was validated against. Reverse sort the versions array so we get the newest
// validated release available.
krsort($versions);
}
// CDB reverse sorts extension versions, so we need to resort them // Get the first available version from the previous list.
ksort($versions);
// Get the lowest version from the previous list.
$update_info = array_reduce($versions, function($value, $data) use ($self, $current_version) { $update_info = array_reduce($versions, function($value, $data) use ($self, $current_version) {
if ($value === null && $self->compare($data['current'], $current_version, '>=')) if ($value === null && $self->compare($data['current'], $current_version, '>='))
{ {