michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-08-05 15:30:44 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

don;'t completely crash if one module fails

Browse Source
This commit is contained in:
Jamie Cameron
2016-04-08 12:07:54 -07:00
parent b05a2794d8
commit c613cdc8c9
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
web-lib-funcs.pl
View File

@@ -10264,12 +10264,15 @@ foreach my $m (&get_available_module_infos()) {
my $dir = &module_root_directory($m->{'dir'});
my $mfile = "$dir/webmin_menu.pl";
next if (!-r $mfile);
&foreign_require($m->{'dir'}, "webmin_menu.pl");
foreach my $i (&foreign_call($m->{'dir'}, "list_webmin_menu",
$data, $in)) {
$i->{'module'} = $m->{'dir'};
push(@rv, $i);
}
eval {
local $main::error_must_die = 1;
&foreign_require($m->{'dir'}, "webmin_menu.pl");
foreach my $i (&foreign_call($m->{'dir'}, "list_webmin_menu",
$data, $in)) {
$i->{'module'} = $m->{'dir'};
push(@rv, $i);
}
};
}
return sort { ($b->{'priority'} || 0) <=> ($a->{'priority'} || 0) } @rv;
}