From 80573c4d0bfd5774f2a456350bacdc13fb2df924 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 31 Dec 2018 08:28:03 -0300 Subject: [PATCH] Bug 22049: (follow-up) Remove leftover variable The $circControlBranch variable was originally set to be used to pick the right dropbox branch. It was only used in MarkIssueReturned, to get the right Koha::Calendar object. As this responsability was moved top to the AddReturn caller, and the fact that _GetCircControlBranch is actually used for fines rules, there's no use for it in this context. And it was left on the previous patch as a mistake. To test: - Make sure the variable is not actually used: $ git grep '$circControlBranch' => SUCCESS: removed variable is not actually used. - Sign off :-D Signed-off-by: Owen Leonard Signed-off-by: Charles Farmer --- C4/Circulation.pm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 19e7941..6387d06 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1896,13 +1896,7 @@ sub AddReturn { my $is_overdue; die "The item is not issed and cannot be returned" unless $issue; # Just in case... $patron or warn "AddReturn without current borrower"; - my $circControlBranch; if ($dropbox) { - # define circControlBranch only if dropbox mode is set - # don't allow dropbox mode to create an invalid entry in issues (issuedate > today) - # FIXME: check issuedate > returndate, factoring in holidays - - $circControlBranch = _GetCircControlBranch($item,$patron_unblessed); $is_overdue = $issue->is_overdue( $dropboxdate ); } else { $is_overdue = $issue->is_overdue; -- 2.7.4