From db312526b2be2dbc4fce365eab65bc7809c3e910 Mon Sep 17 00:00:00 2001 From: Dobrica Pavlinusic Date: Wed, 21 Mar 2012 11:47:49 +0100 Subject: [PATCH] Bug 7775 - tools/upload-file.pl: scoping for plack $uploaded_file is now scoped with our, and we set correct filename Signed-off-by: Alex Arnaud Signed-off-by: Paul Poulain --- tools/upload-file.pl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/upload-file.pl b/tools/upload-file.pl index d520b4d7e7..b705f5c8fc 100755 --- a/tools/upload-file.pl +++ b/tools/upload-file.pl @@ -46,7 +46,7 @@ if ($auth_status ne "ok") { exit 0; } -my $uploaded_file = C4::UploadedFile->new($sessionID); +our $uploaded_file = C4::UploadedFile->new($sessionID); unless (defined $uploaded_file) { # FIXME - failed to create file for some reason send_reply('failed', ''); @@ -54,8 +54,6 @@ unless (defined $uploaded_file) { } $uploaded_file->max_size($ENV{'CONTENT_LENGTH'}); # may not be the file size, exactly -my $first_chunk = 1; - my $query; $query = new CGI \&upload_hook; $uploaded_file->done(); @@ -68,9 +66,8 @@ exit 0; sub upload_hook { my ($file_name, $buffer, $bytes_read, $session) = @_; $uploaded_file->stash(\$buffer, $bytes_read); - if ($first_chunk) { + if ( ! $uploaded_file->name && $file_name ) { # save name on first chunk $uploaded_file->name($file_name); - $first_chunk = 0; } } -- 2.11.4.GIT