Remove duplicate $baseurl template variable

[friendica.git] / src / Module / Admin / Federation.php

diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php
index 3d697a7fda65f6ad94677bce48eb19847473cf2f..ae7445d9e594352a7065650c128c94d2c55e7e49 100644 (file)
--- a/src/Module/Admin/Federation.php
+++ b/src/Module/Admin/Federation.php
@@ -5,7 +5,6 @@ namespace Friendica\Module\Admin;
 use Friendica\Core\Config;\r
 use Friendica\Core\L10n;\r
 use Friendica\Core\Renderer;\r
-use Friendica\Core\System;\r
 use Friendica\Database\DBA;\r
 use Friendica\Module\BaseAdminModule;\r
 \r
@@ -84,14 +83,14 @@ class Federation extends BaseAdminModule
                        // Reformat and compact version numbers\r
                        if ($platform == 'Pleroma') {\r
                                $compacted = [];\r
-\r
                                foreach ($versionCounts as $key => $value) {\r
                                        $version = $versionCounts[$key]['version'];\r
                                        $parts = explode(' ', trim($version));\r
                                        do {\r
                                                $part = array_pop($parts);\r
                                        } while (!empty($parts) && ((strlen($part) >= 40) || (strlen($part) <= 3)));\r
-\r
+                                       // only take the x.x.x part of the version, not the "release" after the dash\r
+                                       $part = array_shift(explode('-', $part));\r
                                        if (!empty($part)) {\r
                                                if (empty($compacted[$part])) {\r
                                                        $compacted[$part] = $versionCounts[$key]['total'];\r
@@ -194,7 +193,6 @@ class Federation extends BaseAdminModule
                        '$counts' => $counts,\r
                        '$version' => FRIENDICA_VERSION,\r
                        '$legendtext' => L10n::t('Currently this node is aware of %d nodes with %d registered users from the following platforms:', $total, $users),\r
-                       '$baseurl' => System::baseUrl(),\r
                ]);\r
        }\r
 }\r