keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Backport updated Pleroma version number handling

Browse source
This commit is contained in:
Hypolite Petovan 2019-04-26 09:11:58 -04:00
parent db5b66e6f1
commit 3d64ac603e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Module/Admin/Federation.php
View file

@ -84,14 +84,14 @@ class Federation extends BaseAdminModule
// Reformat and compact version numbers // Reformat and compact version numbers
if ($platform == 'Pleroma') { if ($platform == 'Pleroma') {
$compacted = []; $compacted = [];
foreach ($versionCounts as $key => $value) { foreach ($versionCounts as $key => $value) {
$version = $versionCounts[$key]['version']; $version = $versionCounts[$key]['version'];
$parts = explode(' ', trim($version)); $parts = explode(' ', trim($version));
do { do {
$part = array_pop($parts); $part = array_pop($parts);
} while (!empty($parts) && ((strlen($part) >= 40) || (strlen($part) <= 3))); } while (!empty($parts) && ((strlen($part) >= 40) || (strlen($part) <= 3)));
// only take the x.x.x part of the version, not the "release" after the dash
$part = array_shift(explode('-', $part));
if (!empty($part)) { if (!empty($part)) {
if (empty($compacted[$part])) { if (empty($compacted[$part])) {
$compacted[$part] = $versionCounts[$key]['total']; $compacted[$part] = $versionCounts[$key]['total'];