1berry/webmin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't modify a list that is being iterated over

Browse Source
This commit is contained in:
Jamie Cameron 2015-03-13 16:41:34 -07:00
parent 181d92ff48
commit cefecfb173
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web-lib-funcs.pl
View File

@ -10213,11 +10213,16 @@ if (&foreign_available("webmin")) {
}
}
# Obey vetos for blocks from other modules
foreach my $veto (grep { $_->{'type'} eq 'veto' } @rv) {
@rv = grep { my $v = $_->{'id'} eq $veto->{'veto'} &&
(!$veto->{'veto_module'} ||
$veto->{'veto_module'} eq $_->{'module'});
!$v } @rv;
my @vetos = grep { $_->{'type'} eq 'veto' } @rv;
foreach my $veto (@vetos) {
my @vrv;
foreach my $m (@rv) {
my $v = $m->{'id'} eq $veto->{'veto'} &&
(!$veto->{'veto_module'} ||
$veto->{'veto_module'} eq $m->{'module'});
push(@vrv, $m) if (!$v);
}
@rv = @vrv;
}
@rv = grep { $_->{'type'} ne 'veto' } @rv;
return sort { ($b->{'priority'} || 0) <=> ($a->{'priority'} || 0) } @rv;