From 49c352532198e5f9d08e209ae7d25b05eb3d84fc Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Mon, 16 Jan 2012 18:58:10 +0100 Subject: [PATCH] Revert "Bug 7364: Possible to get to FA item add without current branch being defined." This reverts commit 6f681bec2d71d3d2b88aea5f8e0c15010241d580. Reverting because on my test server, I get syntax error at /home/paul/koha.dev/koha-community/cataloguing/additem.pl line 668, near "->param{" Execution of /home/paul/koha.dev/koha-community/cataloguing/additem.pl aborted due to compilation errors. --- cataloguing/additem.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index 9ec9a382f3..a734d0fefe 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -665,7 +665,10 @@ my $onlymine = C4::Context->preference('IndependantBranches') && C4::Context->userenv && C4::Context->userenv->{flags}!=1 && C4::Context->userenv->{branch}; -my $branch = $input->param{'branch'} || C4::Context->userenv->{branch}; +my $branch = C4::Context->userenv->{branch}; +if ($frameworkcode eq 'FA'){ + $branch = $input->param('branch'); +} my $branches = GetBranchesLoop($branch,$onlymine); # build once ahead of time, instead of multiple times later. # We generate form, from actuel record -- 2.39.5