From b98dbf6a9f0bf8e4375854170d71f374dc1ffcfd Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Thu, 23 Mar 2017 09:51:09 -0300 Subject: [PATCH] Bug 18320: Remove patroncards/edit-layout.pl warnings MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch removes warnings generated by the script itself. To test: - Go to Tools › Patron card creator › Manage layouts and Tools › Patron card creator › New layout - Add a new layout, adit existing. => FAIL: Warnings logged by edit-layout.pl - Apply this patch - Go to Tools › Patron card creator › Manage layouts and Tools › Patron card creator › New layout - Add a new layout, adit existing. => SUCCESS: No warnings generated by edit-layout.pl - Sign off :-D Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Fridolin Somers Signed-off-by: Kyle M Hall (cherry picked from commit b2a7b8f310fe617b8e19d3bfe14c440df8258d98) Signed-off-by: Andrew Fuerste-Henry --- patroncards/edit-layout.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patroncards/edit-layout.pl b/patroncards/edit-layout.pl index b50c221c02..09cea1e2ca 100755 --- a/patroncards/edit-layout.pl +++ b/patroncards/edit-layout.pl @@ -175,14 +175,14 @@ elsif ($op eq 'save') { my $image_select = 0; my $field_enabled = 0; CGI_PARAMS: - foreach my $parameter ($cgi->param()) { # parse the field values and build a hash of the layout for conversion to xml and storage in the db + foreach my $parameter ($cgi->multi_param()) { # parse the field values and build a hash of the layout for conversion to xml and storage in the db if ($parameter =~ m/^field_([0-9])_(.*)$/) { my $field_number = $1; my $field_data = $2; $field_enabled = $field_number if $field_data eq 'enable'; next CGI_PARAMS unless $field_number == $field_enabled; if ($field_data eq 'text') { - push @$text_lines, $cgi->param($parameter); + push @$text_lines, $cgi->multi_param($parameter); if ($array_index <= 0) { $array_index++; } @@ -196,7 +196,7 @@ elsif ($op eq 'save') { } elsif ($parameter =~ m/^barcode_(.*)$/) { $field_enabled = $1 if $1 eq 'print'; - next CGI_PARAMS unless $field_enabled eq 'print'; + next CGI_PARAMS unless defined $field_enabled && $field_enabled eq 'print'; $layout->{'barcode'}->{$1} = $cgi->param($parameter); } elsif ($parameter =~m/^image_([0-9])_(.*)$/) { -- 2.39.5