Merge branch 'master' of github.com:webmin/webmin

phpini/list_pkgs.cgi

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

phpini/phpini-lib.pl

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

web-lib-funcs.pl

@@ -14060,8 +14060,7 @@ return $dir;
 }
 
 # allocate_miniserv_websocket([module], [base-remote-user])
-# Allocate a new websocket and
-# stores it miniserv.conf file
+# Allocate a new websocket and stores it miniserv.conf file
 sub allocate_miniserv_websocket
 {
 my ($module, $buser) = @_;