From: Ian Walls <ian.walls@bywatersolutions.com>
Date: Tue, 25 Jan 2011 04:09:39 +0000 (-0500)
Subject: Bug 5376: Batch Mod and Delete require superlibrarian permissions
X-Git-Tag: html_template_pro~440
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=12c116236f0f686005bbe035659778012bcaf862;p=koha-ffzg.git

Bug 5376: Batch Mod and Delete require superlibrarian permissions

This only occurs with IndependantBranches turned on; in an attempt to check that the items being
modified belonged to the user's branch, the code made a simultaneous comparison and assignment,
which is not permitted in all compilations of Perl.

Splitting the assignment of $itembranchcode and the check for its non-null value fixes the problem

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---

diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index 921c4d66b0..d9a0b76911 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -429,7 +429,8 @@ sub BuildItemsData{
 			my %this_row;
 			foreach my $field (grep {$_->tag() eq $itemtagfield} $itemmarc->fields()) {
 				# loop through each subfield
-				if (my $itembranchcode=$field->subfield($branchtagsubfield) && C4::Context->preference("IndependantBranches")) {
+				my $itembranchcode=$field->subfield($branchtagsubfield);
+				if ($itembranchcode && C4::Context->preference("IndependantBranches")) {
 						#verifying rights
 						my $userenv = C4::Context->userenv();
 						unless (($userenv->{'flags'} == 1) or (($userenv->{'branch'} eq $itembranchcode))){