From 6749b6307830a45bfa115be0d8d13e2105c00263 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 10 Jan 2017 22:20:40 +0000 Subject: [PATCH] Bug 17879: Use image filename if no image name is entered This patch changes the code to use the filename of the uploaded image if no specific image name is entered. To test: 1) Go to Tools -> Patron card creator -> Manage images 2) Upload an image and leave the image name field empty 3) Notice this works and 'Name' is left empty. 4) Apply patch and refresh page 5) Upload an image and leave the image name field empty 6) Notice the image name is given the filename so that 'Name' is no longer empty. Sponsored-by: Catalyst IT Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit d3752c85dc2f5af974ec2fe4585efa8510302968) Signed-off-by: Katrin Fischer (cherry picked from commit d8ff6f0ea8a0839c4689897fa27857b33f9bfb81) Signed-off-by: Julian Maurice --- patroncards/image-manage.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patroncards/image-manage.pl b/patroncards/image-manage.pl index 78f0463e60..ed0302cb9b 100755 --- a/patroncards/image-manage.pl +++ b/patroncards/image-manage.pl @@ -26,8 +26,8 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user({ debug => 0, }); -my $image_name = $cgi->param('image_name') || ''; my $file_name = $cgi->param('uploadfile') || ''; +my $image_name = $cgi->param('image_name') || $file_name; my $upload_file = $cgi->upload('uploadfile') || ''; my $op = $cgi->param('op') || 'none'; my @image_ids = $cgi->multi_param('image_id') if $cgi->param('image_id'); -- 2.39.5