Bug 17879: Use image filename if no image name is entered

[koha.git] / patroncards / edit-profile.pl

diff --git a/patroncards/edit-profile.pl b/patroncards/edit-profile.pl
index 415cd8c..b7e61bd 100755 (executable)
--- a/patroncards/edit-profile.pl
+++ b/patroncards/edit-profile.pl
@@ -54,13 +54,13 @@ if ($op eq 'edit') {
 }
 elsif ($op eq 'save') {
     my @params = (
-        printer_name        => $cgi->param('printer_name'),
-        paper_bin           => $cgi->param('paper_bin'),
-        offset_horz         => $cgi->param('offset_horz'),
-        offset_vert         => $cgi->param('offset_vert'),
-        creep_horz          => $cgi->param('creep_horz'),
-        creep_vert          => $cgi->param('creep_vert'),
-        units               => $cgi->param('units'),
+        printer_name        => scalar $cgi->param('printer_name'),
+        paper_bin           => scalar $cgi->param('paper_bin'),
+        offset_horz         => scalar $cgi->param('offset_horz'),
+        offset_vert         => scalar $cgi->param('offset_vert'),
+        creep_horz          => scalar $cgi->param('creep_horz'),
+        creep_vert          => scalar $cgi->param('creep_vert'),
+        units               => scalar $cgi->param('units'),
     );
     if ($profile_id) {   # if a label_id was passed in, this is an update to an existing layout
         $profile = C4::Patroncards::Profile->retrieve(profile_id => $profile_id);
@@ -88,7 +88,10 @@ foreach my $unit (@$units) {
     }
 }
 
-$template->param(profile_id => $profile->get_attr('profile_id')) if $profile->get_attr('profile_id') > 0;
+# if new layout, there will be no profile id, so shouldn't look for it
+if ( $profile_id && $profile->get_attr('profile_id') > 0 ) {
+    $template->param( profile_id => $profile->get_attr('profile_id') );
+}
 
 $template->param(
     label_template      => $label_template[0]->{'template_code'} || '',