michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Show the full version properly

Browse Source
This commit is contained in:
Jamie Cameron
2026-01-23 13:46:21 -08:00
parent 2d7900d550
commit 3c1c327530
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpini/list_pkgs.cgi
View File

@@ -61,9 +61,7 @@ if (&foreign_installed("package-updates")) {
my @allpkgs = &extend_installable_php_packages(\@newpkgs); my @allpkgs = &extend_installable_php_packages(\@newpkgs);
@allpkgs = sort { $b->{'ver'} cmp $a->{'ver'} } @allpkgs; @allpkgs = sort { $b->{'ver'} cmp $a->{'ver'} } @allpkgs;
print &ui_select("u", undef, print &ui_select("u", undef,
[ map { [ $_->{'name'}, [ map { [ $_->{'name'}, "PHP $_->{'ver'}" ] } @allpkgs ]);
"PHP ". ($_->{'ver'} == 5 ? '5.6' : $_->{'ver'})
] } @allpkgs ]);
print &ui_hidden( print &ui_hidden(
"redir", &get_webprefix()."/$module_name/list_pkgs.cgi"); "redir", &get_webprefix()."/$module_name/list_pkgs.cgi");
print &ui_hidden("redirdesc", $text{'pkgs_title'}); print &ui_hidden("redirdesc", $text{'pkgs_title'});

3
phpini/phpini-lib.pl
View File

@@ -1047,7 +1047,8 @@ my @pkgs;
my @extra = ('cli', 'fpm'); my @extra = ('cli', 'fpm');
foreach my $pkg (@{$pkgs}) { foreach my $pkg (@{$pkgs}) {
my $p = { 'name' => $pkg->{'name'}, my $p = { 'name' => $pkg->{'name'},
'ver' => $pkg->{'shortver'} }; 'shortver' => $pkg->{'shortver'},
'ver' => $pkg->{'ver'} };
$p->{'name'} .= ' '.join(' ', map { "$1-$_" } @extra) $p->{'name'} .= ' '.join(' ', map { "$1-$_" } @extra)
if ($p->{'name'} =~ /^(.*)-common$/); if ($p->{'name'} =~ /^(.*)-common$/);
push(@pkgs, $p); push(@pkgs, $p);