From c6110083c7e131392875368055f072fa47856145 Mon Sep 17 00:00:00 2001 From: D Ruth Bavousett Date: Fri, 16 Dec 2011 10:38:47 -0500 Subject: [PATCH] Bug 7364: Possible to get to FA item add without current branch being defined. Some paths to the FA item-add screen didn't have a branch defined--if the param is set, use it, otherwise, use the user's logged in branch. Signed-off-by: Chris Cormack Modified for syntax by: Ian Walls Signed-off-by: Ian Walls --- cataloguing/additem.pl | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index a734d0f..d22558f 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -665,10 +665,7 @@ my $onlymine = C4::Context->preference('IndependantBranches') && C4::Context->userenv && C4::Context->userenv->{flags}!=1 && C4::Context->userenv->{branch}; -my $branch = C4::Context->userenv->{branch}; -if ($frameworkcode eq 'FA'){ - $branch = $input->param('branch'); -} +my $branch = $input->param('branch') || C4::Context->userenv->{branch}; my $branches = GetBranchesLoop($branch,$onlymine); # build once ahead of time, instead of multiple times later. # We generate form, from actuel record -- 1.7.4.1