From cdf0c5dc16de28d9b8df1858aa0d0139a425b86f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Demians?= Date: Fri, 9 Sep 2016 08:06:19 +0200 Subject: [PATCH] Bug 17281 Warning when saving subfield structure MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit TO TEST: 1. Home > MARC Framework > Default > Actions > MARC structure 2. On 073 field (for example), click Edit 3. Click on Edit subfield button 4. Click on Save changes 5. Take a look in intranet logs. You find: Use of uninitialized value in string eq at ../admin/marc_subfields_structure.pl 6. Apply the patch, and repeat steps 3-5 => no more warning in log Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall (cherry picked from commit 259679e9dece15b69b216b8e39f8e4ebd0b58800) Signed-off-by: Frédéric Demians --- admin/marc_subfields_structure.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl index 096b9ec919..175133a330 100755 --- a/admin/marc_subfields_structure.pl +++ b/admin/marc_subfields_structure.pl @@ -285,7 +285,8 @@ elsif ( $op eq 'add_validate' ) { my $maxlength = $maxlength[$i] ? $maxlength[$i] : 9999; if (defined($liblibrarian) && $liblibrarian ne "") { - unless ( C4::Context->config('demo') or C4::Context->config('demo') eq 1 ) { + my $is_demo = C4::Context->config('demo') || ''; + if ( $is_demo ne '1' ) { if (marc_subfield_structure_exists($tagfield, $tagsubfield, $frameworkcode)) { $sth_update->execute( $tagfield, @@ -376,7 +377,8 @@ elsif ( $op eq 'delete_confirm' ) { } elsif ( $op eq 'delete_confirmed' ) { my $dbh = C4::Context->dbh; - unless ( C4::Context->config('demo') or C4::Context->config('demo') eq 1 ) { + my $is_demo = C4::Context->config('demo') || ''; + if ( $is_demo ne '1' ) { my $sth = $dbh->prepare( "delete from marc_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?" -- 2.39.5