Bug 3319 Followup: Fix compatibility with fix for bug 4945
The fix for 3319 overwrote the @branchloop variable with output from GetBranchesLoop, which forces a selected branch. Removing the extra call, and just measuring the size of @branchloop as it was build, plus some dereferencing, fixes the issue. Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
parent
e6a3029470
commit
ac9fd0cff9
|
|
@ -66,12 +66,12 @@ foreach (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname}
|
|||
my @categories;
|
||||
my $no_categories;
|
||||
my $no_add = 0;
|
||||
my $branchloop = (defined $branch?GetBranchesLoop($branch):GetBranchesLoop());
|
||||
if(scalar(@$branchloop) < 1){
|
||||
if(scalar(@branchloop) < 1){
|
||||
$no_add = 1;
|
||||
$template->param(no_branches => 1);
|
||||
} else {
|
||||
$template->param(branchloop=>\@$branchloop);
|
||||
}
|
||||
else {
|
||||
$template->param(branchloop=>\@branchloop);
|
||||
}
|
||||
|
||||
@categories=C4::Category->all;
|
||||
|
|
|
|||
Loading…
Reference in New Issue